AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxgtk_window_size_request_callback is not needed by wxStaticText anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2009-01-24 13:42:00 +00:00
parent 7d7b3f69f2
commit 9800347d77
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/window.cpp
View File

@ -257,11 +257,11 @@ gdk_window_warp_pointer (GdkWindow *window,
// "size_request" of m_widget // "size_request" of m_widget
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// make it extern because wxStaticText needs to disconnect this one
extern "C" { extern "C" {
void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget), static void
GtkRequisition *requisition, wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
wxWindow * win) GtkRequisition *requisition,
wxWindow * win)
{ {
int w, h; int w, h;
win->GetSize( &w, &h ); win->GetSize( &w, &h );
@ -2095,7 +2095,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
{ {
// Get default border // Get default border
wxBorder border = GetBorder(style); wxBorder border = GetBorder(style);
style &= ~wxBORDER_MASK; style &= ~wxBORDER_MASK;
style |= border; style |= border;
@ -2681,7 +2681,7 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
continue; continue;
} }
GtkScrolledWindowClass *scroll_class = GtkScrolledWindowClass *scroll_class =
GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) ); GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
GtkRequisition req; GtkRequisition req;