fixes for moving wxHTML files into their own DLL

[wxWidgets.git] / include / wx / gtk / control.h

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index f18f219d8c691229e212d30683432ae21183302e..17db76e5711942fd57da856cd3aff3f6a2351fda 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -10,7 +10,7 @@
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 
 #ifndef __GTKCONTROLH__
 #define __GTKCONTROLH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -29,18 +29,24 @@ class wxControl;
 // wxControl
 //-----------------------------------------------------------------------------
 
 // wxControl
 //-----------------------------------------------------------------------------
 

-class wxControl : public wxWindow
+class wxControl : public wxControlBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxControl)
-

 public:
     wxControl();
 public:
     wxControl();

-    wxControl( wxWindow *parent,
-               wxWindowID id,
-               const wxPoint &pos = wxDefaultPosition,
-               const wxSize &size = wxDefaultSize,
-               long style = 0,
-               const wxString &name = wxPanelNameStr );
+    wxControl(wxWindow *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize, long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxControlNameStr)
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxControlNameStr);

 
     // this function will filter out '&' characters and will put the accelerator
     // char (the one immediately after '&') into m_chAccel (TODO not yet)
 
     // this function will filter out '&' characters and will put the accelerator
     // char (the one immediately after '&') into m_chAccel (TODO not yet)


@@ -48,8 +54,16 @@ public:
     virtual wxString GetLabel() const;
 
 protected:
     virtual wxString GetLabel() const;
 
 protected:

+    virtual wxSize DoGetBestSize() const;
+#ifdef __WXGTK20__
+    wxString PrepareLabelMnemonics( const wxString &label ) const;
+#endif
+

     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxControl)

 };
 
 #endif // __GTKCONTROLH__
 };
 
 #endif // __GTKCONTROLH__