attempt to fix first click problem

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index a2a31bdcb7f8e10df3fc57bbd6d0e30fb3b71444..eca2ce40f8ae260f98d5162fe87d9c86ade2bec4 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(__APPLE__)

 #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,26 +46,14 @@ public:
     {
         return FALSE;
     }
     {
         return FALSE;
     }

-    
-    void SetLabel(const wxString& label);
-    wxString GetLabel() const;
-    
-    // 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; }
-    
-protected:
-    // Motif-specific
-    WXWidget  m_formWidget;
+
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
+
+    virtual void SetLabel(const wxString& label);
+
+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()
 };
 private:
     DECLARE_EVENT_TABLE()
 };