From: Francesco Montorsi Date: Sat, 24 Jan 2009 13:42:00 +0000 (+0000) Subject: wxgtk_window_size_request_callback is not needed by wxStaticText anymore X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9800347d77319c663d987889967054f91e5898c7?ds=inline wxgtk_window_size_request_callback is not needed by wxStaticText anymore git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 0a6eb5b75e..d6cbbfdc19 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -257,11 +257,11 @@ gdk_window_warp_pointer (GdkWindow *window, // "size_request" of m_widget //----------------------------------------------------------------------------- -// make it extern because wxStaticText needs to disconnect this one extern "C" { -void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget), - GtkRequisition *requisition, - wxWindow * win) +static void +wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget), + GtkRequisition *requisition, + wxWindow * win) { int w, h; win->GetSize( &w, &h ); @@ -2095,7 +2095,7 @@ bool wxWindowGTK::Create( wxWindow *parent, { // Get default border wxBorder border = GetBorder(style); - + style &= ~wxBORDER_MASK; style |= border; @@ -2681,7 +2681,7 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const continue; } - GtkScrolledWindowClass *scroll_class = + GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) ); GtkRequisition req;