no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index 7d827c0d4bfaac9c40147b687e35e70579912d4a..b216e24143475eeb8ab9ea4b9b7dd9d37b152df4 100644 (file)
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -1,59 +1,59 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stabox.h
+// Name:        wx/gtk/stabox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKSTATICBOXH__
 #define __GTKSTATICBOXH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
 //-----------------------------------------------------------------------------
-// classes
+// wxStaticBox
 //-----------------------------------------------------------------------------
 
-class wxStaticBox;
+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
+{
+public:
+    wxStaticBox();
+    wxStaticBox( wxWindow *parent,
+                 wxWindowID id,
+                 const wxString &label,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxStaticBoxNameStr );
+    bool Create( wxWindow *parent,
+                 wxWindowID id,
+                 const wxString &label,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxStaticBoxNameStr );
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    virtual void SetLabel( const wxString &label );
 
-extern const char *wxStaticBoxNameStr;
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-//-----------------------------------------------------------------------------
-// wxStaticBox
-//-----------------------------------------------------------------------------
+    // implementation
 
-class wxStaticBox: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    virtual bool IsTransparentForMouse() const { return TRUE; }
+
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 
-  public:
+    virtual void AddChild( wxWindowBase *child );
 
-    wxStaticBox(void);
-    wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = 0, const wxString &name = wxStaticBoxNameStr  );
-    bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = 0, const wxString &name = wxStaticBoxNameStr  );
-    void SetLabel( const wxString &label );
+protected:
+    virtual bool GTKWidgetNeedsMnemonic() const;
+    virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 
-  // implementation
+    void DoApplyWidgetStyle(GtkRcStyle *style);
     
-    void ApplyWidgetStyle();
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
 
 #endif // __GTKSTATICBOXH__