fix printf() argument type in GetOsInfo()

[wxWidgets.git] / include / wx / gtk1 / statbox.h

diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index b63c97324eeb8369d527e06af488a867cbb426ee..400f56377e40a8eedd14b7caf5bd60f4bed3a2bf 100644 (file)
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/stabox.h
+// Name:        wx/gtk1/stabox.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,19 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKSTATICBOXH__
 #define __GTKSTATICBOXH__
 
 #ifndef __GTKSTATICBOXH__
 #define __GTKSTATICBOXH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 

-class wxStaticBox : public wxStaticBoxBase
+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase

 {
 public:
     wxStaticBox();
 {
 public:
     wxStaticBox();


@@ -40,8 +35,6 @@ public:
 
     virtual void SetLabel( const wxString &label );
 
 
     virtual void SetLabel( const wxString &label );
 

-    bool SetFont( const wxFont &font );
-    

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 


@@ -49,6 +42,9 @@ public:
 
     virtual bool IsTransparentForMouse() const { return TRUE; }
 
 
     virtual bool IsTransparentForMouse() const { return TRUE; }
 

+protected:
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+

 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };