projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add dvd chroma 420pi colormodel, misc fixes
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcwindowbase.h
diff --git
a/cinelerra-5.1/guicast/bcwindowbase.h
b/cinelerra-5.1/guicast/bcwindowbase.h
index 4d0e45679bfc9b3fd436849f19c657de301c23bc..a5cb7fcc2597b1eecf05988c18c49d96d722615f 100644
(file)
--- a/
cinelerra-5.1/guicast/bcwindowbase.h
+++ b/
cinelerra-5.1/guicast/bcwindowbase.h
@@
-22,12
+22,6
@@
#ifndef BCWINDOWBASE_H
#define BCWINDOWBASE_H
#ifndef BCWINDOWBASE_H
#define BCWINDOWBASE_H
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
-//#define HAVE_LIBXXF86VM
-
// Window types
#define MAIN_WINDOW 0
#define SUB_WINDOW 1
// Window types
#define MAIN_WINDOW 0
#define SUB_WINDOW 1
@@
-571,7
+565,7
@@
private:
int trigger_tooltip();
int untrigger_tooltip();
void draw_tooltip();
int trigger_tooltip();
int untrigger_tooltip();
void draw_tooltip();
-
int arm_repeat(int64_t duration
);
+
static XEvent *new_xevent(
);
// delete all repeater opjects for a close
int unset_all_repeaters();
// delete all repeater opjects for a close
int unset_all_repeaters();
@@
-699,6
+693,7
@@
private:
#ifndef SINGLE_THREAD
// Array of repeaters for multiple repeating objects.
ArrayList<BC_Repeater*> repeaters;
#ifndef SINGLE_THREAD
// Array of repeaters for multiple repeating objects.
ArrayList<BC_Repeater*> repeaters;
+ int arm_repeat(int64_t duration);
#endif
// Text for tooltip if one exists
const char *tooltip_text;
#endif
// Text for tooltip if one exists
const char *tooltip_text;