Replaced typedef with #define for VC++ 1.5, to prevent 'no constructor' error

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

diff --git a/include/wx/control.h b/include/wx/control.h
index e4341393e83ba945a9ecea97d788527b8f32140c..c50fe6c033fdaa00cc94b522b932548f0b4844b1 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -1,18 +1,77 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/control.h
+// Purpose:     wxControl common interface
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     26.07.99
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_CONTROL_H_BASE_
 #define _WX_CONTROL_H_BASE_
 
 #ifndef _WX_CONTROL_H_BASE_
 #define _WX_CONTROL_H_BASE_
 

+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma interface "controlbase.h"
+#endif
+
+#include "wx/window.h"      // base class
+
+// ----------------------------------------------------------------------------
+// wxControl is the base class for all controls
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxControlBase : public wxWindow
+{
+public:
+#ifdef __WXMAC_X__
+    virtual ~wxControlBase() {}   // Added min for Mac X
+#endif
+    // simulates the event of given type (i.e. wxButton::Command() is just as
+    // if the button was clicked)
+    virtual void Command(wxCommandEvent &event);
+
+protected:
+    // creates the control (calls wxWindowBase::CreateBase inside) and adds it
+    // to the list of parents children
+    bool CreateControl(wxWindowBase *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name);
+
+    // 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
+// ----------------------------------------------------------------------------
+

 #if defined(__WXMSW__)
 #if defined(__WXMSW__)

-#include "wx/msw/control.h"
+    #include "wx/msw/control.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/control.h"
+    #include "wx/motif/control.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/control.h"
+    #include "wx/gtk/control.h"

 #elif defined(__WXQT__)
 #elif defined(__WXQT__)

-#include "wx/qt/control.h"
+    #include "wx/qt/control.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

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

 #elif defined(__WXSTUBS__)
 #elif defined(__WXSTUBS__)

-#include "wx/stubs/control.h"
+    #include "wx/stubs/control.h"

 #endif
 
 #endif
 #endif
 
 #endif