diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index 8d1d92f1f3..0390914207 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -15,8 +15,8 @@ #if wxUSE_CHECKLISTBOX -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // wxCheckListBox diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 7e2499fe45..97ea9be8b9 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -16,8 +16,8 @@ #if wxUSE_CHOICE -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -103,7 +103,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, for (int i = 0; i < n; i++) { - AppendHelper(menu, choices[i]); + GtkAppendHelper(menu, choices[i]); } gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); @@ -134,7 +134,7 @@ int wxChoice::DoAppend( const wxString &item ) GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); - return AppendHelper(menu, item); + return GtkAppendHelper(menu, item); } void wxChoice::DoSetItemClientData( int n, void* clientData ) @@ -318,36 +318,6 @@ void wxChoice::SetSelection( int n ) gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); } -void wxChoice::DisableEvents() -{ -/* - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - GList *child = menu_shell->children; - while (child) - { - gtk_signal_disconnect_by_func( GTK_OBJECT( child->data ), - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); - - child = child->next; - } -*/ -} - -void wxChoice::EnableEvents() -{ -/* - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - GList *child = menu_shell->children; - while (child) - { - gtk_signal_connect( GTK_OBJECT( child->data ), "activate", - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); - - child = child->next; - } -*/ -} - void wxChoice::ApplyWidgetStyle() { SetWidgetStyle(); @@ -373,7 +343,7 @@ void wxChoice::ApplyWidgetStyle() } } -size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item) +size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item) { GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() ); diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp index 58b1952e17..89f0c01611 100644 --- a/src/gtk/clipbrd.cpp +++ b/src/gtk/clipbrd.cpp @@ -19,9 +19,9 @@ #include "wx/utils.h" #include "wx/log.h" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include //----------------------------------------------------------------------------- // thread system diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index a4ca937116..7577edccfc 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -14,8 +14,8 @@ #include "wx/gdicmn.h" -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" +#include +#include //----------------------------------------------------------------------------- // wxColour diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index d8a36d5ef3..32b082064a 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -18,8 +18,8 @@ #include "wx/settings.h" #include "wx/intl.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index a0b88f5944..c150c147ee 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -13,7 +13,7 @@ #include "wx/control.h" -#include "gtk/gtk.h" +#include //----------------------------------------------------------------------------- // wxControl diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index e660bcc9ea..80f7c26d60 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -15,7 +15,7 @@ #include "wx/cursor.h" #include "wx/utils.h" -#include "gdk/gdk.h" +#include //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index 77b0e87066..e901b6ea57 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -17,7 +17,7 @@ #include "wx/mstream.h" #include "wx/image.h" -#include "gdk/gdk.h" +#include //------------------------------------------------------------------------- // global data diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp index 489a2f102e..da0b27c97a 100644 --- a/src/gtk/dc.cpp +++ b/src/gtk/dc.cpp @@ -14,8 +14,8 @@ #include "wx/dc.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // constants diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 722c2a664e..17d8ea2baa 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -15,10 +15,10 @@ #include "wx/dcmemory.h" #include "wx/image.h" #include "wx/gtk/win_gtk.h" -#include // for floating-point functions -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include // for floating-point functions +#include +#include //----------------------------------------------------------------------------- // local data diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index 617cbd744a..5e81a54933 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/dcmemory.cpp @@ -13,8 +13,8 @@ #include "wx/dcmemory.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // wxMemoryDC diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp index fa25cfe537..33766926fd 100644 --- a/src/gtk/dcscreen.cpp +++ b/src/gtk/dcscreen.cpp @@ -14,8 +14,8 @@ #include "wx/dcscreen.h" #include "wx/window.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // global data initialization @@ -31,9 +31,8 @@ int wxScreenDC::sm_overlayWindowY = 0; extern "C" { -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" -#include "gdk/gdkx.h" +#include +#include #include int my_nevent_masks = 17; diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index ee255c1890..5411e1cb9d 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -16,9 +16,10 @@ #include "wx/app.h" #include "wx/cursor.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkkeysyms.h" +#include +#include +#include + #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 25b6eb46f6..74e429bbd8 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -21,12 +21,12 @@ #include "wx/intl.h" #include "wx/utils.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkprivate.h" +#include +#include +#include -#include "gtk/gtkdnd.h" -#include "gtk/gtkselection.h" +#include +#include //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 17d9087884..c1c2c6f3e8 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -16,7 +16,7 @@ #include "wx/intl.h" #include "wx/generic/msgdlgg.h" -#include "gtk/gtk.h" +#include //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index c2e51daba6..6cd4c22b1c 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -29,7 +29,7 @@ #include -#include "gdk/gdk.h" +#include // ---------------------------------------------------------------------------- // wxFontRefData diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index da71a4a355..54d5f9edfd 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -861,7 +861,7 @@ GtkWidget *wxListBox::GetConnectWidget() bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { - if (wxWindow::IsOwnGtkWindow( window )) return TRUE; + if (GTK_WIDGET(m_list)->window == window) return TRUE; GList *child = m_list->children; while (child) diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp index 8d1d92f1f3..0390914207 100644 --- a/src/gtk1/checklst.cpp +++ b/src/gtk1/checklst.cpp @@ -15,8 +15,8 @@ #if wxUSE_CHECKLISTBOX -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // wxCheckListBox diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index 7e2499fe45..97ea9be8b9 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -16,8 +16,8 @@ #if wxUSE_CHOICE -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -103,7 +103,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, for (int i = 0; i < n; i++) { - AppendHelper(menu, choices[i]); + GtkAppendHelper(menu, choices[i]); } gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); @@ -134,7 +134,7 @@ int wxChoice::DoAppend( const wxString &item ) GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); - return AppendHelper(menu, item); + return GtkAppendHelper(menu, item); } void wxChoice::DoSetItemClientData( int n, void* clientData ) @@ -318,36 +318,6 @@ void wxChoice::SetSelection( int n ) gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); } -void wxChoice::DisableEvents() -{ -/* - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - GList *child = menu_shell->children; - while (child) - { - gtk_signal_disconnect_by_func( GTK_OBJECT( child->data ), - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); - - child = child->next; - } -*/ -} - -void wxChoice::EnableEvents() -{ -/* - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - GList *child = menu_shell->children; - while (child) - { - gtk_signal_connect( GTK_OBJECT( child->data ), "activate", - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); - - child = child->next; - } -*/ -} - void wxChoice::ApplyWidgetStyle() { SetWidgetStyle(); @@ -373,7 +343,7 @@ void wxChoice::ApplyWidgetStyle() } } -size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item) +size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item) { GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() ); diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp index 58b1952e17..89f0c01611 100644 --- a/src/gtk1/clipbrd.cpp +++ b/src/gtk1/clipbrd.cpp @@ -19,9 +19,9 @@ #include "wx/utils.h" #include "wx/log.h" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include //----------------------------------------------------------------------------- // thread system diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index a4ca937116..7577edccfc 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -14,8 +14,8 @@ #include "wx/gdicmn.h" -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" +#include +#include //----------------------------------------------------------------------------- // wxColour diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index d8a36d5ef3..32b082064a 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -18,8 +18,8 @@ #include "wx/settings.h" #include "wx/intl.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index a0b88f5944..c150c147ee 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -13,7 +13,7 @@ #include "wx/control.h" -#include "gtk/gtk.h" +#include //----------------------------------------------------------------------------- // wxControl diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index e660bcc9ea..80f7c26d60 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -15,7 +15,7 @@ #include "wx/cursor.h" #include "wx/utils.h" -#include "gdk/gdk.h" +#include //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 77b0e87066..e901b6ea57 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -17,7 +17,7 @@ #include "wx/mstream.h" #include "wx/image.h" -#include "gdk/gdk.h" +#include //------------------------------------------------------------------------- // global data diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp index 489a2f102e..da0b27c97a 100644 --- a/src/gtk1/dc.cpp +++ b/src/gtk1/dc.cpp @@ -14,8 +14,8 @@ #include "wx/dc.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // constants diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index 722c2a664e..17d8ea2baa 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -15,10 +15,10 @@ #include "wx/dcmemory.h" #include "wx/image.h" #include "wx/gtk/win_gtk.h" -#include // for floating-point functions -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include // for floating-point functions +#include +#include //----------------------------------------------------------------------------- // local data diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index 617cbd744a..5e81a54933 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -13,8 +13,8 @@ #include "wx/dcmemory.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // wxMemoryDC diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp index fa25cfe537..33766926fd 100644 --- a/src/gtk1/dcscreen.cpp +++ b/src/gtk1/dcscreen.cpp @@ -14,8 +14,8 @@ #include "wx/dcscreen.h" #include "wx/window.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // global data initialization @@ -31,9 +31,8 @@ int wxScreenDC::sm_overlayWindowY = 0; extern "C" { -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" -#include "gdk/gdkx.h" +#include +#include #include int my_nevent_masks = 17; diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index ee255c1890..5411e1cb9d 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -16,9 +16,10 @@ #include "wx/app.h" #include "wx/cursor.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkkeysyms.h" +#include +#include +#include + #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index 25b6eb46f6..74e429bbd8 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -21,12 +21,12 @@ #include "wx/intl.h" #include "wx/utils.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkprivate.h" +#include +#include +#include -#include "gtk/gtkdnd.h" -#include "gtk/gtkselection.h" +#include +#include //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp index 17d9087884..c1c2c6f3e8 100644 --- a/src/gtk1/filedlg.cpp +++ b/src/gtk1/filedlg.cpp @@ -16,7 +16,7 @@ #include "wx/intl.h" #include "wx/generic/msgdlgg.h" -#include "gtk/gtk.h" +#include //----------------------------------------------------------------------------- // idle system diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index c2e51daba6..6cd4c22b1c 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -29,7 +29,7 @@ #include -#include "gdk/gdk.h" +#include // ---------------------------------------------------------------------------- // wxFontRefData diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index da71a4a355..54d5f9edfd 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -861,7 +861,7 @@ GtkWidget *wxListBox::GetConnectWidget() bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { - if (wxWindow::IsOwnGtkWindow( window )) return TRUE; + if (GTK_WIDGET(m_list)->window == window) return TRUE; GList *child = m_list->children; while (child)