changed/centralized window creation code to allow wxTLW work in wxUniv

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

diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index 7978dd9bc8832db888e987db6d758225f3b2aca4..abda2db80290a20ff312b90136482eb098c71970 100644 (file)
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -15,50 +15,37 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_STATBOX
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxStaticBoxNameStr;
-

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

-class wxStaticBox: public wxControl
+class wxStaticBox : public wxStaticBoxBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
-  public:
+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 );
+
+    virtual void SetLabel( const wxString &label );
+
+    // implementation

 
 

-    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 );
-
-  // implementation
-    

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

-};

 
 

-#endif
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+};

 
 #endif // __GTKSTATICBOXH__
 
 #endif // __GTKSTATICBOXH__