updated Joystick demo, is now wxDesigner-less

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 6858103d6e2b3f82e3d53868e4e53edaaf9e1147..012e5c5a32d5ad3fc0973ff55c192e4449d2a0c9 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -6,7 +6,7 @@
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_BASE_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_BASE_


@@ -16,10 +16,12 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma interface "controlbase.h"
 #endif
 
     #pragma interface "controlbase.h"
 #endif
 

+#include "wx/defs.h"
+

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


@@ -33,6 +35,10 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:

+    wxControlBase() { }
+
+    virtual ~wxControlBase();
+

     // Create() function adds the validator parameter
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
     // Create() function adds the validator parameter
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,


@@ -48,9 +54,10 @@ public:
     // get the control alignment (left/right/centre, top/bottom/centre)
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
 
     // get the control alignment (left/right/centre, top/bottom/centre)
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
 

-#ifdef __DARWIN__
-    virtual ~wxControlBase() { }
-#endif
+    // controls by default inherit the colours of their parents, if a
+    // particular control class doesn't want to do it, it can override
+    // ShouldInheritColours() to return false
+    virtual bool ShouldInheritColours() const { return true; }

 
 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
 
 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it


@@ -68,6 +75,8 @@ protected:
 
     // initialize the common fields of wxCommandEvent
     void InitCommandEvent(wxCommandEvent& event) const;
 
     // initialize the common fields of wxCommandEvent
     void InitCommandEvent(wxCommandEvent& event) const;

+
+    DECLARE_NO_COPY_CLASS(wxControlBase)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -82,14 +91,12 @@ protected:
     #include "wx/motif/control.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/control.h"
     #include "wx/motif/control.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/control.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/control.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/control.h"

 #elif defined(__WXPM__)
     #include "wx/os2/control.h"
 #elif defined(__WXPM__)
     #include "wx/os2/control.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/control.h"

 #endif
 
 #endif // wxUSE_CONTROLS
 #endif
 
 #endif // wxUSE_CONTROLS