Various changes to make pop up menus work

[wxWidgets.git] / src / gtk1 / stattext.cpp

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index ff7c054a02055ea3bfc69b425a2f9ecdf9fbe549..f10c32753c92eba493c55b015478fb9b3fa71acb 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -12,6 +12,10 @@
     #pragma implementation "stattext.h"
 #endif
 
     #pragma implementation "stattext.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_STATTEXT
+

 #include "wx/stattext.h"
 
 #include "gdk/gdk.h"
 #include "wx/stattext.h"
 
 #include "gdk/gdk.h"


@@ -81,6 +85,8 @@ bool wxStaticText::Create(wxWindow *parent,
     m_parent->DoAddChild( this );
 
     PostCreation();
     m_parent->DoAddChild( this );
 
     PostCreation();

+    
+    ApplyWidgetStyle();

 
     wxControl::SetFont( parent->GetFont() );
     
 
     wxControl::SetFont( parent->GetFont() );
     


@@ -148,9 +154,10 @@ wxSize wxStaticText::DoGetBestSize() const
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )

         (m_widget, &req );
 
     return wxSize(req.width, req.height);
 }
 
         (m_widget, &req );
 
     return wxSize(req.width, req.height);
 }
 

+#endif // wxUSE_STATTEXT