forward port from 2.8

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

diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index f0f1b2ff0efa759927040514fed86b3a701bf608..437e1836f21d32eb907b7a58d70262c9eb5b845b 100644 (file)
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -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();


@@ -45,10 +40,16 @@ public:
 
     // implementation
 
 
     // implementation
 

-    virtual void ApplyWidgetStyle();
-

     virtual bool IsTransparentForMouse() const { return TRUE; }
 
     virtual bool IsTransparentForMouse() const { return TRUE; }
 

+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+
+protected:
+    virtual bool GTKWidgetNeedsMnemonic() const;
+    virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
+
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+    

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