we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index 99a9b2944537699904231f46b5fe31fc9880e637..c26d7ba69dc3010c4d76057b2973299d85c1d4fa 100644 (file)
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -12,66 +12,51 @@
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "statbox.h"
 #endif
 
 #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 WXDLLEXPORT 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,

-            const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxStaticBoxNameStr)
+        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);
     }
     {
         Create(parent, id, label, pos, size, style, name);
     }

-    ~wxStaticBox();

 
 

+    ~wxStaticBox();
+    

     bool Create(wxWindow *parent, wxWindowID id,
     bool Create(wxWindow *parent, wxWindowID id,

-            const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxStaticBoxNameStr);
-
+        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;
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }

 
 

-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    WXWidget GetTopWidget() const { return m_formWidget; }
-    WXWidget GetLabelWidget() const { return m_labelWidget; }
+    virtual void SetLabel(const wxString& label);

 
 

-protected:
-    // Motif-specific
-    WXWidget  m_formWidget;
+private:

     WXWidget  m_labelWidget;
     WXWidget  m_labelWidget;

-
-    virtual void DoSetSize(int x, int y,
-            int width, int height,
-            int sizeFlags = wxSIZE_AUTO);
-
+   

 private:
     DECLARE_EVENT_TABLE()
 };
 
 #endif
 private:
     DECLARE_EVENT_TABLE()
 };
 
 #endif

-    // _WX_STATBOX_H_
+// _WX_STATBOX_H_