1. wxChoice and wxComboBox support client data under MSW

2. control creation streamlined under MSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/control.h

@@ -1,21 +1,69 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
-// all classes derived from wxControl need the validators
-#include "wx/validate.h"
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma interface "choicebase.h"
+#endif
+
+#include "wx/window.h"      // base class
+
+// ----------------------------------------------------------------------------
+// wxControl is the base class for all controls
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxControlBase : public wxWindow
+{
+public:
+    // 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
+    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();
+};
+
+// ----------------------------------------------------------------------------
+// include platform-dependent wxControl declarations
+// ----------------------------------------------------------------------------
 
 #if defined(__WXMSW__)
-#include "wx/msw/control.h"
+    #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/control.h"
+    #include "wx/motif/control.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/control.h"
+    #include "wx/gtk/control.h"
 #elif defined(__WXQT__)
-#include "wx/qt/control.h"
+    #include "wx/qt/control.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/control.h"
+    #include "wx/mac/control.h"
 #elif defined(__WXSTUBS__)
-#include "wx/stubs/control.h"
+    #include "wx/stubs/control.h"
 #endif
 
 #endif