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

Fixing a few fixes..

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-04-12 14:41:43 +00:00
parent ea18eed94c
commit ef47f9b3fd
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/win_gtk.c
View File

@@ -417,8 +417,10 @@ gtk_myfixed_size_allocate (GtkWidget *widget,
if (myfixed->shadow_type == GTK_SHADOW_NONE) if (myfixed->shadow_type == GTK_SHADOW_NONE)
border = 0; border = 0;
else else
#endif
border = 2; border = 2;
#else
border = 0;
#endif
widget->allocation = *allocation; widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget)) if (GTK_WIDGET_REALIZED (widget))

12
src/gtk/window.cpp
View File

@@ -121,12 +121,6 @@
*/ */
//-------------------------------------------------------------------------
// constants
//-------------------------------------------------------------------------
#define FRAME_BORDER_WIDTH 2
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// data // data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -141,6 +135,8 @@ static wxWindow *g_focusWindow = (wxWindow*) NULL;
the last click here */ the last click here */
static guint32 gs_timeLastClick = 0; static guint32 gs_timeLastClick = 0;
#if (GTK_MINOR_VERSION > 0)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// local code (see below) // local code (see below)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -227,6 +223,8 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
draw_frame( widget, win ); draw_frame( widget, win );
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "expose_event" of m_wxwindow // "expose_event" of m_wxwindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1740,12 +1738,14 @@ void wxWindow::PostCreation()
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); 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 */ /* these are called when the "sunken" or "raised" borders are drawn */
gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(m_widget), "draw", gtk_signal_connect( GTK_OBJECT(m_widget), "draw",
GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
#endif
} }
ConnectWidget( GetConnectWidget() ); ConnectWidget( GetConnectWidget() );

4
src/gtk1/win_gtk.c
View File

@@ -417,8 +417,10 @@ gtk_myfixed_size_allocate (GtkWidget *widget,
if (myfixed->shadow_type == GTK_SHADOW_NONE) if (myfixed->shadow_type == GTK_SHADOW_NONE)
border = 0; border = 0;
else else
#endif
border = 2; border = 2;
#else
border = 0;
#endif
widget->allocation = *allocation; widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget)) if (GTK_WIDGET_REALIZED (widget))

12
src/gtk1/window.cpp
View File

@@ -121,12 +121,6 @@
*/ */
//-------------------------------------------------------------------------
// constants
//-------------------------------------------------------------------------
#define FRAME_BORDER_WIDTH 2
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// data // data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -141,6 +135,8 @@ static wxWindow *g_focusWindow = (wxWindow*) NULL;
the last click here */ the last click here */
static guint32 gs_timeLastClick = 0; static guint32 gs_timeLastClick = 0;
#if (GTK_MINOR_VERSION > 0)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// local code (see below) // local code (see below)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -227,6 +223,8 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
draw_frame( widget, win ); draw_frame( widget, win );
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "expose_event" of m_wxwindow // "expose_event" of m_wxwindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1740,12 +1738,14 @@ void wxWindow::PostCreation()
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); 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 */ /* these are called when the "sunken" or "raised" borders are drawn */
gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(m_widget), "draw", gtk_signal_connect( GTK_OBJECT(m_widget), "draw",
GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
#endif
} }
ConnectWidget( GetConnectWidget() ); ConnectWidget( GetConnectWidget() );