From ef47f9b3fded2daa62e1181bfa7f6b9df830ec9a Mon Sep 17 00:00:00 2001 From: Robert Roebling <robert@roebling.de> Date: Mon, 12 Apr 1999 14:41:43 +0000 Subject: [PATCH] Fixing a few fixes.. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/win_gtk.c | 4 +++- src/gtk/window.cpp | 12 ++++++------ src/gtk1/win_gtk.c | 4 +++- src/gtk1/window.cpp | 12 ++++++------ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 7e8498ea5a..c199d05b9b 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -417,8 +417,10 @@ gtk_myfixed_size_allocate (GtkWidget *widget, if (myfixed->shadow_type == GTK_SHADOW_NONE) border = 0; else -#endif border = 2; +#else + border = 0; +#endif widget->allocation = *allocation; if (GTK_WIDGET_REALIZED (widget)) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index ecc4c6101f..7f2fa89f26 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -121,12 +121,6 @@ */ -//------------------------------------------------------------------------- -// constants -//------------------------------------------------------------------------- - -#define FRAME_BORDER_WIDTH 2 - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -141,6 +135,8 @@ static wxWindow *g_focusWindow = (wxWindow*) NULL; the last click here */ static guint32 gs_timeLastClick = 0; +#if (GTK_MINOR_VERSION > 0) + //----------------------------------------------------------------------------- // local code (see below) //----------------------------------------------------------------------------- @@ -227,6 +223,8 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU draw_frame( widget, win ); } +#endif + //----------------------------------------------------------------------------- // "expose_event" of m_wxwindow //----------------------------------------------------------------------------- @@ -1740,12 +1738,14 @@ void wxWindow::PostCreation() gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); +#if (GTK_MINOR_VERSION > 0) /* these are called when the "sunken" or "raised" borders are drawn */ gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(m_widget), "draw", GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this ); +#endif } ConnectWidget( GetConnectWidget() ); diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index 7e8498ea5a..c199d05b9b 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -417,8 +417,10 @@ gtk_myfixed_size_allocate (GtkWidget *widget, if (myfixed->shadow_type == GTK_SHADOW_NONE) border = 0; else -#endif border = 2; +#else + border = 0; +#endif widget->allocation = *allocation; if (GTK_WIDGET_REALIZED (widget)) diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index ecc4c6101f..7f2fa89f26 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -121,12 +121,6 @@ */ -//------------------------------------------------------------------------- -// constants -//------------------------------------------------------------------------- - -#define FRAME_BORDER_WIDTH 2 - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -141,6 +135,8 @@ static wxWindow *g_focusWindow = (wxWindow*) NULL; the last click here */ static guint32 gs_timeLastClick = 0; +#if (GTK_MINOR_VERSION > 0) + //----------------------------------------------------------------------------- // local code (see below) //----------------------------------------------------------------------------- @@ -227,6 +223,8 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU draw_frame( widget, win ); } +#endif + //----------------------------------------------------------------------------- // "expose_event" of m_wxwindow //----------------------------------------------------------------------------- @@ -1740,12 +1738,14 @@ void wxWindow::PostCreation() gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); +#if (GTK_MINOR_VERSION > 0) /* these are called when the "sunken" or "raised" borders are drawn */ gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(m_widget), "draw", GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this ); +#endif } ConnectWidget( GetConnectWidget() ); -- 2.45.2