second part of Markus' BC++ fix

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

diff --git a/include/wx/control.h b/include/wx/control.h
index c68cfa4e8442930f4f16bee79832d5f4fde9c392..c50fe6c033fdaa00cc94b522b932548f0b4844b1 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma interface "choicebase.h"
+    #pragma interface "controlbase.h"
 #endif
 
 #include "wx/window.h"      // base class
@@ -29,13 +29,16 @@
 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 controls (invokes wxWindowBase::CreateBase) and adds it to
-    // the list of parents children
+    // 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,
@@ -46,6 +49,9 @@ protected:
 
     // inherit colour and font settings from the parent window
     void InheritAttributes();
+
+    // initialize the common fields of wxCommandEvent
+    void InitCommandEvent(wxCommandEvent& event) const;
 };
 
 // ----------------------------------------------------------------------------