Further wxUniv fixes

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

diff --git a/include/wx/control.h b/include/wx/control.h
index c50fe6c033fdaa00cc94b522b932548f0b4844b1..41dc31feb69aaf11dc027268f84c0e20e0ead323 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -20,8 +20,12 @@
     #pragma interface "controlbase.h"
 #endif
 
+#if wxUSE_CONTROLS
+
 #include "wx/window.h"      // base class
 
+extern const wxChar* wxControlNameStr; // the default name
+
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
 // ----------------------------------------------------------------------------
@@ -29,13 +33,25 @@
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:
-#ifdef __WXMAC_X__
-    virtual ~wxControlBase() {}   // Added min for Mac X
-#endif
+    // Create() function adds the validator parameter
+    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);
+
     // simulates the event of given type (i.e. wxButton::Command() is just as
     // if the button was clicked)
     virtual void Command(wxCommandEvent &event);
 
+    // get the control alignment (left/right/centre, top/bottom/centre)
+    int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
+
+#ifdef __WXMAC_X__
+    virtual ~wxControlBase() { }   // Added min for Mac X
+#endif
+
 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
@@ -58,7 +74,9 @@ protected:
 // include platform-dependent wxControl declarations
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/control.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/control.h"
@@ -74,5 +92,7 @@ protected:
     #include "wx/stubs/control.h"
 #endif
 
+#endif // wxUSE_CONTROLS
+
 #endif
     // _WX_CONTROL_H_BASE_