add to GetToolkitVersion() the = NULL default values for the two arguments: they...

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

diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h
index bd03d3479410a2018e57dbe864c5e2dd5a21af9a..ac327c6180da5d1cd1d51713e481e0888957c7ff 100644 (file)
--- a/include/wx/os2/statbox.h
+++ b/include/wx/os2/statbox.h
@@ -1,59 +1,66 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbox.h
 // Purpose:     wxStaticBox class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/15/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
-#ifdef __GNUG__
-#pragma interface "statbox.h"
-#endif
-
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
-
 // Group box
-class WXDLLEXPORT wxStaticBox: public wxControl
+class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
- public:
-  inline wxStaticBox() {}
-  inline wxStaticBox(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticBoxNameStr)
-  {
-    Create(parent, id, label, pos, size, style, name);
-  }
-
-  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 Command(wxCommandEvent& WXUNUSED(event)) {};
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
-
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetLabel(const wxString& label);
-
-DECLARE_EVENT_TABLE()
+public:
+    inline wxStaticBox() {}
+    inline wxStaticBox( wxWindow*       pParent
+                       ,wxWindowID      vId
+                       ,const wxString& rsLabel
+                       ,const wxPoint&  rPos = wxDefaultPosition
+                       ,const wxSize&   rSize = wxDefaultSize
+                       ,long            lStyle = 0
+                       ,const wxString& rsName = wxStaticBoxNameStr
+                      )
+    {
+        Create(pParent, vId, rsLabel, rPos, rSize, lStyle, rsName);
+    }
+
+    bool Create( wxWindow*       pParent
+                ,wxWindowID      vId
+                ,const wxString& rsLabel
+                ,const wxPoint&  rPos = wxDefaultPosition
+                ,const wxSize&   rSize = wxDefaultSize
+                ,long            lStyle = 0
+                ,const wxString& rsName = wxStaticBoxNameStr
+               );
+
+    //
+    // implementation from now on
+    // --------------------------
+    //
+    virtual MRESULT OS2WindowProc( WXUINT   uMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+
+    //
+    // overriden base class virtuals
+    //
+    inline virtual bool AcceptsFocus(void) const { return FALSE; }
+
+protected:
+    virtual wxSize DoGetBestSize(void) const;
+
 private:
-  void SetSize(int width, int height) {wxWindow::SetSize(width, height);}
-};
+    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+}; // end of CLASS wxStaticBox
 
 #endif
     // _WX_STATBOX_H_
+