Added wxHelpControllerHelpProvider, added DisplayContextPopup, DisplayTextPopup

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

diff --git a/include/wx/control.h b/include/wx/control.h
index c68cfa4e8442930f4f16bee79832d5f4fde9c392..7b1d491309475276824f16719b4cc82f132436fe 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma interface "choicebase.h"
+    #pragma interface "controlbase.h"

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


@@ -34,8 +34,8 @@ public:
     virtual void Command(wxCommandEvent &event);
 
 protected:
     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,
     bool CreateControl(wxWindowBase *parent,
                        wxWindowID id,
                        const wxPoint& pos,


@@ -46,6 +46,9 @@ protected:
 
     // 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;

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