Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/include/wx/control.h b/include/wx/control.h
index bfdda99063859b2fdf4d29081b2f6bdef1eacf7a..fb90b4dbefc521760c1b3712de642d049a961e09 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -20,8 +20,12 @@
     #pragma interface "controlbase.h"
 #endif
 
     #pragma interface "controlbase.h"
 #endif
 

+#if wxUSE_CONTROLS
+

 #include "wx/window.h"      // base class
 
 #include "wx/window.h"      // base class
 

+WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+

 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
 // ----------------------------------------------------------------------------


@@ -29,10 +33,25 @@
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:

+    // 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);
 
     // 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
 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children


@@ -41,36 +60,23 @@ protected:
                        const wxPoint& pos,
                        const wxSize& size,
                        long style,
                        const wxPoint& pos,
                        const wxSize& size,
                        long style,

-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-                       const wxValidator* validator,
-#  else

                        const wxValidator& validator,
                        const wxValidator& validator,

-#  endif
-#endif

                        const wxString& name);
 
                        const wxString& name);
 

-    // an overloaded version for the controls without validators
-    bool CreateControl(wxWindowBase *parent,
-                       wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxString& name)
-    {
-        return CreateControl(parent, id, pos, size, style,
-                             wxDefaultValidator, name);
-    }
-

     // inherit colour and font settings from the parent window
     void InheritAttributes();
     // inherit colour and font settings from the parent window
     void InheritAttributes();

+
+    // initialize the common fields of wxCommandEvent
+    void InitCommandEvent(wxCommandEvent& event) const;

 };
 
 // ----------------------------------------------------------------------------
 // include platform-dependent wxControl declarations
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // 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"
     #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/control.h"


@@ -86,5 +92,7 @@ protected:
     #include "wx/stubs/control.h"
 #endif
 
     #include "wx/stubs/control.h"
 #endif
 

+#endif // wxUSE_CONTROLS
+

 #endif
     // _WX_CONTROL_H_BASE_
 #endif
     // _WX_CONTROL_H_BASE_