* Implemented BestSize cache

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index 38a5e89ebd3f5350fb334af7c017ed4971f4d468..59549a5327f7adfa80f8398956f5bd800d0f0f9c 100644 (file)
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -12,16 +12,12 @@
 #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)
         


@@ -36,6 +32,7 @@ public:
     {
         Create(parent, id, label, pos, size, style, name);
     }
     {
         Create(parent, id, label, pos, size, style, name);
     }

+

     ~wxStaticBox();
     
     bool Create(wxWindow *parent, wxWindowID id,
     ~wxStaticBox();
     
     bool Create(wxWindow *parent, wxWindowID id,


@@ -49,15 +46,12 @@ public:
     {
         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);
+
+private:

     WXWidget  m_labelWidget;
    
 private:
     WXWidget  m_labelWidget;
    
 private: