Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GTK+ 1 compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-12-24 02:20:15 +00:00
parent 76471ff7f5
commit defdd88800
8 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/cursor.cpp
View File

@@ -69,7 +69,7 @@ wxCursor::wxCursor( int cursorId )
case wxCURSOR_BLANK: case wxCURSOR_BLANK:
{ {
static const gchar bits[] = { 0 }; static const gchar bits[] = { 0 };
static const GdkColor color = { 0, 0, 0, 0 }; static /* const -- not in GTK1 */ GdkColor color = { 0, 0, 0, 0 };
GdkPixmap *pixmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1); GdkPixmap *pixmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1);
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(pixmap, M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(pixmap,

7
src/gtk/menu.cpp
View File

@@ -44,6 +44,11 @@
// we use normal item but with a special id for the menu title // we use normal item but with a special id for the menu title
static const int wxGTK_TITLE_ID = -3; static const int wxGTK_TITLE_ID = -3;
// defined in window.cpp
#ifndef __WXGTK20__
extern guint32 wxGtkTimeLastClick;
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// idle system // idle system
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1624,7 +1629,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gtk_get_current_event_time() gtk_get_current_event_time()
#else #else
gs_timeLastClick // the time of activation wxGtkTimeLastClick // the time of activation
#endif #endif
); );

8
src/gtk/toplevel.cpp
View File

@@ -1364,13 +1364,16 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
void wxTopLevelWindowGTK::SetWindowStyleFlag( long style ) void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
{ {
#ifdef __WXGTK20__
// Store which styles were changed // Store which styles were changed
long styleChanges = style ^ m_windowStyle; long styleChanges = style ^ m_windowStyle;
#endif
// Process wxWindow styles. This also updates the internal variable // Process wxWindow styles. This also updates the internal variable
// Therefore m_windowStyle bits carry now the _new_ style values // Therefore m_windowStyle bits carry now the _new_ style values
wxWindow::SetWindowStyleFlag(style); wxWindow::SetWindowStyleFlag(style);
#ifdef __WXGTK20__
// just return for now if widget does not exist yet // just return for now if widget does not exist yet
if (!m_widget) if (!m_widget)
return; return;
@@ -1378,11 +1381,12 @@ void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if ( (styleChanges & wxSTAY_ON_TOP) && !gtk_check_version(2,4,0) ) if ( (styleChanges & wxSTAY_ON_TOP) && !gtk_check_version(2,4,0) )
gtk_window_set_keep_above(GTK_WINDOW(m_widget), m_windowStyle & wxSTAY_ON_TOP); gtk_window_set_keep_above(GTK_WINDOW(m_widget), m_windowStyle & wxSTAY_ON_TOP);
#endif #endif // GTK+ 2.4
#if GTK_CHECK_VERSION(2,2,0) #if GTK_CHECK_VERSION(2,2,0)
if ( (styleChanges & wxFRAME_NO_TASKBAR) && !gtk_check_version(2,2,0) ) if ( (styleChanges & wxFRAME_NO_TASKBAR) && !gtk_check_version(2,2,0) )
{ {
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), m_windowStyle & wxFRAME_NO_TASKBAR); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), m_windowStyle & wxFRAME_NO_TASKBAR);
} }
#endif #endif // GTK+ 2.2
#endif // GTK+ 2.0
} }

6
src/gtk/window.cpp
View File

@@ -238,9 +238,9 @@ wxWindowGTK *g_focusWindowLast = (wxWindowGTK*) NULL;
wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL; wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL;
// hack: we need something to pass to gtk_menu_popup, so we store the time of // hack: we need something to pass to gtk_menu_popup, so we store the time of
// the last click here // the last click here (extern: used from gtk/menu.cpp)
#ifndef __WXGTK20__ #ifndef __WXGTK20__
static guint32 gs_timeLastClick = 0; guint32 wxGtkTimeLastClick = 0;
#endif #endif
extern bool g_mainThreadLocked; extern bool g_mainThreadLocked;
@@ -1802,7 +1802,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
win = FindWindowForMouseEvent(win, event.m_x, event.m_y); win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
#ifndef __WXGTK20__ #ifndef __WXGTK20__
gs_timeLastClick = gdk_event->time; wxGtkTimeLastClick = gdk_event->time;
if (event_type == wxEVT_LEFT_DCLICK) if (event_type == wxEVT_LEFT_DCLICK)
{ {

2
src/gtk1/cursor.cpp
View File

@@ -69,7 +69,7 @@ wxCursor::wxCursor( int cursorId )
case wxCURSOR_BLANK: case wxCURSOR_BLANK:
{ {
static const gchar bits[] = { 0 }; static const gchar bits[] = { 0 };
static const GdkColor color = { 0, 0, 0, 0 }; static /* const -- not in GTK1 */ GdkColor color = { 0, 0, 0, 0 };
GdkPixmap *pixmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1); GdkPixmap *pixmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1);
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(pixmap, M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(pixmap,

7
src/gtk1/menu.cpp
View File

@@ -44,6 +44,11 @@
// we use normal item but with a special id for the menu title // we use normal item but with a special id for the menu title
static const int wxGTK_TITLE_ID = -3; static const int wxGTK_TITLE_ID = -3;
// defined in window.cpp
#ifndef __WXGTK20__
extern guint32 wxGtkTimeLastClick;
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// idle system // idle system
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1624,7 +1629,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
#ifdef __WXGTK20__ #ifdef __WXGTK20__
gtk_get_current_event_time() gtk_get_current_event_time()
#else #else
gs_timeLastClick // the time of activation wxGtkTimeLastClick // the time of activation
#endif #endif
); );

8
src/gtk1/toplevel.cpp
View File

@@ -1364,13 +1364,16 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
void wxTopLevelWindowGTK::SetWindowStyleFlag( long style ) void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
{ {
#ifdef __WXGTK20__
// Store which styles were changed // Store which styles were changed
long styleChanges = style ^ m_windowStyle; long styleChanges = style ^ m_windowStyle;
#endif
// Process wxWindow styles. This also updates the internal variable // Process wxWindow styles. This also updates the internal variable
// Therefore m_windowStyle bits carry now the _new_ style values // Therefore m_windowStyle bits carry now the _new_ style values
wxWindow::SetWindowStyleFlag(style); wxWindow::SetWindowStyleFlag(style);
#ifdef __WXGTK20__
// just return for now if widget does not exist yet // just return for now if widget does not exist yet
if (!m_widget) if (!m_widget)
return; return;
@@ -1378,11 +1381,12 @@ void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if ( (styleChanges & wxSTAY_ON_TOP) && !gtk_check_version(2,4,0) ) if ( (styleChanges & wxSTAY_ON_TOP) && !gtk_check_version(2,4,0) )
gtk_window_set_keep_above(GTK_WINDOW(m_widget), m_windowStyle & wxSTAY_ON_TOP); gtk_window_set_keep_above(GTK_WINDOW(m_widget), m_windowStyle & wxSTAY_ON_TOP);
#endif #endif // GTK+ 2.4
#if GTK_CHECK_VERSION(2,2,0) #if GTK_CHECK_VERSION(2,2,0)
if ( (styleChanges & wxFRAME_NO_TASKBAR) && !gtk_check_version(2,2,0) ) if ( (styleChanges & wxFRAME_NO_TASKBAR) && !gtk_check_version(2,2,0) )
{ {
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), m_windowStyle & wxFRAME_NO_TASKBAR); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), m_windowStyle & wxFRAME_NO_TASKBAR);
} }
#endif #endif // GTK+ 2.2
#endif // GTK+ 2.0
} }

6
src/gtk1/window.cpp
View File

@@ -238,9 +238,9 @@ wxWindowGTK *g_focusWindowLast = (wxWindowGTK*) NULL;
wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL; wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL;
// hack: we need something to pass to gtk_menu_popup, so we store the time of // hack: we need something to pass to gtk_menu_popup, so we store the time of
// the last click here // the last click here (extern: used from gtk/menu.cpp)
#ifndef __WXGTK20__ #ifndef __WXGTK20__
static guint32 gs_timeLastClick = 0; guint32 wxGtkTimeLastClick = 0;
#endif #endif
extern bool g_mainThreadLocked; extern bool g_mainThreadLocked;
@@ -1802,7 +1802,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
win = FindWindowForMouseEvent(win, event.m_x, event.m_y); win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
#ifndef __WXGTK20__ #ifndef __WXGTK20__
gs_timeLastClick = gdk_event->time; wxGtkTimeLastClick = gdk_event->time;
if (event_type == wxEVT_LEFT_DCLICK) if (event_type == wxEVT_LEFT_DCLICK)
{ {