gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h
index bd03d3479410a2018e57dbe864c5e2dd5a21af9a..147e7beb380dcab936930c6d5998b54537e4653e 100644 (file)
--- a/include/wx/os2/statbox.h
+++ b/include/wx/os2/statbox.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbox.h
 // Purpose:     wxStaticBox class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbox.h
 // Purpose:     wxStaticBox class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/15/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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;
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;


@@ -26,34 +22,48 @@ class WXDLLEXPORT wxStaticBox: public wxControl
   DECLARE_DYNAMIC_CLASS(wxStaticBox)
 
  public:
   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()
+    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
+             );
+
+    // implementation from now on
+    // --------------------------
+
+    void OnEraseBackground(wxEraseEvent& event);
+
+    virtual MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return FALSE; }
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+

 private:
 private:

-  void SetSize(int width, int height) {wxWindow::SetSize(width, height);}
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
     // _WX_STATBOX_H_
 };
 
 #endif
     // _WX_STATBOX_H_

+