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

corrected bug with alignment of static labels with GTK 2 (replaces patch 760066; closes bug 759375)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-10 22:32:52 +00:00
parent 7f0586ef60
commit e1f448eeef
5 changed files with 71 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk1/window.cpp
View File

@@ -477,12 +477,18 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
// "size_request" of m_widget
//-----------------------------------------------------------------------------
static void gtk_window_size_request_callback( GtkWidget *widget, GtkRequisition *requisition, wxWindow *win )
// make it extern because wxStatitText needs to disconnect this one
extern "C"
void wxgtk_window_size_request_callback(GtkWidget *widget,
GtkRequisition *requisition,
wxWindow *win)
{
int w,h;
int w, h;
win->GetSize( &w, &h );
if (w < 2) w = 2;
if (h < 2) h = 2;
if (w < 2)
w = 2;
if (h < 2)
h = 2;
requisition->height = h;
requisition->width = w;
@@ -2797,7 +2803,7 @@ void wxWindowGTK::PostCreation()
GTK_SIGNAL_FUNC(gtk_wxwindow_size_callback), (gpointer)this );
}
if (!GTK_IS_COMBO(m_widget))
if ( !GTK_IS_COMBO(m_widget))
{
// This is needed if we want to add our windows into native
// GTK control, such as the toolbar. With this callback, the
@@ -2805,7 +2811,8 @@ void wxWindowGTK::PostCreation()
// programmer). Sadly, it misbehaves for wxComboBox. FIXME
// when moving to GTK 2.0.
gtk_signal_connect( GTK_OBJECT(m_widget), "size_request",
GTK_SIGNAL_FUNC(gtk_window_size_request_callback), (gpointer) this );
GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback),
(gpointer) this );
}
m_hasVMT = TRUE;