fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index 38a5e89ebd3f5350fb334af7c017ed4971f4d468..cddbe301e1bf8dfed6977606e61789b50502e0a6 100644 (file)
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbox.h
+// Name:        wx/motif/statbox.h

 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:


@@ -12,19 +12,11 @@
 #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;
-

 // Group box
 // Group box

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

 {
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBox)

-        
+

 public:
     wxStaticBox();
     wxStaticBox(wxWindow *parent, wxWindowID id,
 public:
     wxStaticBox();
     wxStaticBox(wxWindow *parent, wxWindowID id,


@@ -36,30 +28,29 @@ public:
     {
         Create(parent, id, label, pos, size, style, name);
     }
     {
         Create(parent, id, label, pos, size, style, name);
     }

-    ~wxStaticBox();
-    
+
+    virtual ~wxStaticBox();
+

     bool Create(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 bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {

-        return FALSE;
+        return false;

     }
     }

-    
-    void SetLabel(const wxString& label);
-    wxString GetLabel() const;
-    
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    
-protected:
-    // Motif-specific
+
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
+
+    virtual void SetLabel(const wxString& label);
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+
+private:

     WXWidget  m_labelWidget;
     WXWidget  m_labelWidget;

-   
+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };