Include changes again. Something is wrong with CVS...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 8d1d92f1f33e9614f1a2f42a4236f3a47731075c..03909142071d7529a9f627fe008c1f78dde0aa17 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -15,8 +15,8 @@
 
 #if wxUSE_CHECKLISTBOX
 
 
 #if wxUSE_CHECKLISTBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 7e2499fe4569627efdab19832e0326803e398224..97ea9be8b97dac3b73093aaa476d2a9ebcaacea8 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -16,8 +16,8 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -103,7 +103,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     for (int i = 0; i < n; i++)
     {
 
     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 );
     }
 
     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) );
 
 
     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 )
 }
 
 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 );
 }
 
     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();
 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() );
 
 {
     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 58b1952e1708befa571095c6b1d320f43825183b..89f0c0161137be1ee486a028ab4912743d320ae4 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -19,9 +19,9 @@
 #include "wx/utils.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
 #include "wx/log.h"
 

-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // thread system
 
 //-----------------------------------------------------------------------------
 // thread system

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index a4ca937116ddc6940b844535ec12fc0b688c373e..7577edccfc0d80c8f9290c251d2d3c7475698630 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -14,8 +14,8 @@
 
 #include "wx/gdicmn.h"
 
 
 #include "wx/gdicmn.h"
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>

 
 //-----------------------------------------------------------------------------
 // wxColour
 
 //-----------------------------------------------------------------------------
 // wxColour

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index d8a36d5ef3f224ad1f8fe2d17a75f9a39b840985..32b082064a4a9887246bc628c15cafcf92132d9c 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -18,8 +18,8 @@
 #include "wx/settings.h"
 #include "wx/intl.h"
 
 #include "wx/settings.h"
 #include "wx/intl.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index a0b88f5944d1e0b7ba7c1a4139d5d38c0c8dc40a..c150c147eec3f1dcd0b3f8c3cef857de35e411f4 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-#include "gtk/gtk.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxControl
 
 //-----------------------------------------------------------------------------
 // wxControl

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index e660bcc9ea1902166c52efa8193c1729cad82616..80f7c26d60cb6bb71cf12ba4d122e6fdef7865fb 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -15,7 +15,7 @@
 #include "wx/cursor.h"
 #include "wx/utils.h"
 
 #include "wx/cursor.h"
 #include "wx/utils.h"
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 77b0e87066fc2a91ff9fcbac7dbac201cfdcbfdc..e901b6ea57338cc732503d46303d8e916f278490 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -17,7 +17,7 @@
 #include "wx/mstream.h"
 #include "wx/image.h"
 
 #include "wx/mstream.h"
 #include "wx/image.h"
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 //-------------------------------------------------------------------------
 // global data
 
 //-------------------------------------------------------------------------
 // global data

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 489a2f102e03af388ccd52d3998967dcff62c3d0..da0b27c97aacfc682066728f05b7178b1f872bf7 100644 (file)
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -14,8 +14,8 @@
 
 #include "wx/dc.h"
 
 
 #include "wx/dc.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 722c2a664ec426eb0323ec3bc3a96c5ed953a58b..17d8ea2baa496dd7cf88d63b64cbae9a65994ac9 100644 (file)
--- 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 "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/gtk/win_gtk.h"

-#include <math.h>               // for floating-point functions

 
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <math.h>               // for floating-point functions
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // local data
 
 //-----------------------------------------------------------------------------
 // local data

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 617cbd744a7a7070ebffc52faf5737d3c167d7c5..5e81a549335e5aa163c8aa95ec3540a1f7e71d22 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -13,8 +13,8 @@
 
 #include "wx/dcmemory.h"
 
 
 #include "wx/dcmemory.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index fa25cfe537d48477d5074360a65f33506ffd7fdd..33766926fd95d59cd927f0271f865bcaa9fc74b6 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -14,8 +14,8 @@
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // global data initialization
 
 //-----------------------------------------------------------------------------
 // global data initialization


@@ -31,9 +31,8 @@ int wxScreenDC::sm_overlayWindowY = 0;
 
 extern "C" {
 
 
 extern "C" {
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>

 #include <netinet/in.h>
 
 int my_nevent_masks = 17;
 #include <netinet/in.h>
 
 int my_nevent_masks = 17;

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index ee255c1890458478e68544a02372d0505a9ec808..5411e1cb9d4fb67366d2c87a8afe509099856efa 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -16,9 +16,10 @@
 #include "wx/app.h"
 #include "wx/cursor.h"
 
 #include "wx/app.h"
 #include "wx/cursor.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+

 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 25b6eb46f64c5b1b2958ea56337387bccf693d13..74e429bbd84e04ee50f18c6c302cf07f36752b0f 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -21,12 +21,12 @@
 #include "wx/intl.h"
 #include "wx/utils.h"
 
 #include "wx/intl.h"
 #include "wx/utils.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>

 
 

-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkselection.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 17d90878847eb047b13b294f771a63503b05f7d4..c1c2c6f3e8a17fdd4ee7181e74ba2ef3aab2d2d1 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -16,7 +16,7 @@
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 

-#include "gtk/gtk.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index c2e51daba65cbb3e3fc15bfbab7fe42afe9d9e37..6cd4c22b1cec62195d15b078ba99a8ce70b1c539 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -29,7 +29,7 @@
 
 #include <strings.h>
 
 
 #include <strings.h>
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index da71a4a355233299b7f74a7f08aea9bc75b1b810..54d5f9edfdb5810ebdadda1058f281c184fc0dea 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -861,7 +861,7 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 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)
 
     GList *child = m_list->children;
     while (child)

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index 8d1d92f1f33e9614f1a2f42a4236f3a47731075c..03909142071d7529a9f627fe008c1f78dde0aa17 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -15,8 +15,8 @@
 
 #if wxUSE_CHECKLISTBOX
 
 
 #if wxUSE_CHECKLISTBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 7e2499fe4569627efdab19832e0326803e398224..97ea9be8b97dac3b73093aaa476d2a9ebcaacea8 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -16,8 +16,8 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -103,7 +103,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     for (int i = 0; i < n; i++)
     {
 
     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 );
     }
 
     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) );
 
 
     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 )
 }
 
 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 );
 }
 
     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();
 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() );
 
 {
     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 58b1952e1708befa571095c6b1d320f43825183b..89f0c0161137be1ee486a028ab4912743d320ae4 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -19,9 +19,9 @@
 #include "wx/utils.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
 #include "wx/log.h"
 

-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // thread system
 
 //-----------------------------------------------------------------------------
 // thread system

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index a4ca937116ddc6940b844535ec12fc0b688c373e..7577edccfc0d80c8f9290c251d2d3c7475698630 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -14,8 +14,8 @@
 
 #include "wx/gdicmn.h"
 
 
 #include "wx/gdicmn.h"
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>

 
 //-----------------------------------------------------------------------------
 // wxColour
 
 //-----------------------------------------------------------------------------
 // wxColour

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index d8a36d5ef3f224ad1f8fe2d17a75f9a39b840985..32b082064a4a9887246bc628c15cafcf92132d9c 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -18,8 +18,8 @@
 #include "wx/settings.h"
 #include "wx/intl.h"
 
 #include "wx/settings.h"
 #include "wx/intl.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index a0b88f5944d1e0b7ba7c1a4139d5d38c0c8dc40a..c150c147eec3f1dcd0b3f8c3cef857de35e411f4 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-#include "gtk/gtk.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxControl
 
 //-----------------------------------------------------------------------------
 // wxControl

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index e660bcc9ea1902166c52efa8193c1729cad82616..80f7c26d60cb6bb71cf12ba4d122e6fdef7865fb 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -15,7 +15,7 @@
 #include "wx/cursor.h"
 #include "wx/utils.h"
 
 #include "wx/cursor.h"
 #include "wx/utils.h"
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 77b0e87066fc2a91ff9fcbac7dbac201cfdcbfdc..e901b6ea57338cc732503d46303d8e916f278490 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -17,7 +17,7 @@
 #include "wx/mstream.h"
 #include "wx/image.h"
 
 #include "wx/mstream.h"
 #include "wx/image.h"
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 //-------------------------------------------------------------------------
 // global data
 
 //-------------------------------------------------------------------------
 // global data

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 489a2f102e03af388ccd52d3998967dcff62c3d0..da0b27c97aacfc682066728f05b7178b1f872bf7 100644 (file)
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -14,8 +14,8 @@
 
 #include "wx/dc.h"
 
 
 #include "wx/dc.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 722c2a664ec426eb0323ec3bc3a96c5ed953a58b..17d8ea2baa496dd7cf88d63b64cbae9a65994ac9 100644 (file)
--- 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 "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/gtk/win_gtk.h"

-#include <math.h>               // for floating-point functions

 
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <math.h>               // for floating-point functions
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // local data
 
 //-----------------------------------------------------------------------------
 // local data

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 617cbd744a7a7070ebffc52faf5737d3c167d7c5..5e81a549335e5aa163c8aa95ec3540a1f7e71d22 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -13,8 +13,8 @@
 
 #include "wx/dcmemory.h"
 
 
 #include "wx/dcmemory.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index fa25cfe537d48477d5074360a65f33506ffd7fdd..33766926fd95d59cd927f0271f865bcaa9fc74b6 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -14,8 +14,8 @@
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // global data initialization
 
 //-----------------------------------------------------------------------------
 // global data initialization


@@ -31,9 +31,8 @@ int wxScreenDC::sm_overlayWindowY = 0;
 
 extern "C" {
 
 
 extern "C" {
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>

 #include <netinet/in.h>
 
 int my_nevent_masks = 17;
 #include <netinet/in.h>
 
 int my_nevent_masks = 17;

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index ee255c1890458478e68544a02372d0505a9ec808..5411e1cb9d4fb67366d2c87a8afe509099856efa 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -16,9 +16,10 @@
 #include "wx/app.h"
 #include "wx/cursor.h"
 
 #include "wx/app.h"
 #include "wx/cursor.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+

 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 25b6eb46f64c5b1b2958ea56337387bccf693d13..74e429bbd84e04ee50f18c6c302cf07f36752b0f 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -21,12 +21,12 @@
 #include "wx/intl.h"
 #include "wx/utils.h"
 
 #include "wx/intl.h"
 #include "wx/utils.h"
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>

 
 

-#include "gtk/gtkdnd.h"
-#include "gtk/gtkselection.h"
+#include <gtk/gtkdnd.h>
+#include <gtk/gtkselection.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 17d90878847eb047b13b294f771a63503b05f7d4..c1c2c6f3e8a17fdd4ee7181e74ba2ef3aab2d2d1 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -16,7 +16,7 @@
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 

-#include "gtk/gtk.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index c2e51daba65cbb3e3fc15bfbab7fe42afe9d9e37..6cd4c22b1cec62195d15b078ba99a8ce70b1c539 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -29,7 +29,7 @@
 
 #include <strings.h>
 
 
 #include <strings.h>
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index da71a4a355233299b7f74a7f08aea9bc75b1b810..54d5f9edfdb5810ebdadda1058f281c184fc0dea 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -861,7 +861,7 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 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)
 
     GList *child = m_list->children;
     while (child)