merging in the toolbar changes

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index b4a280754370f332fee323589ed73ea833d8f1e7..4c566bfb15e9104a5c1e4c0fba4389512fbc6afe 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -16,11 +16,10 @@
     #pragma interface "control.h"
 #endif
 
-#include "wx/window.h"
-#include "wx/list.h"
+#include "wx/dynarray.h"
 
 // General item class
-class WXDLLEXPORT wxControl : public wxWindow
+class WXDLLEXPORT wxControl : public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
@@ -29,7 +28,10 @@ public:
    virtual ~wxControl();
 
    // Simulates an event
-   bool Command(wxCommandEvent& event) { return ProcessCommand(event); }
+   virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
+
+   // implementation from now on
+   // --------------------------
 
    // Calls the callback and appropriate event handlers
    bool ProcessCommand(wxCommandEvent& event);
@@ -43,10 +45,13 @@ public:
    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 
-   wxList& GetSubcontrols() { return m_subControls; }
+   wxArrayLong GetSubcontrols() { return m_subControls; }
 
    void OnEraseBackground(wxEraseEvent& event);
 
+   virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+                               WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
    wxColour* GetButtonColour() const { return NULL; }
@@ -66,10 +71,30 @@ protected:
 #endif // WXWIN_COMPATIBILITY
 
 protected:
-   // For controls like radiobuttons which are really composite
-   wxList           m_subControls;
-
-    virtual wxSize DoGetBestSize();
+   // for controls like radiobuttons which are really composite this array
+   // holds the ids (not HWNDs!) of the sub controls
+   wxArrayLong m_subControls;
+
+   virtual wxSize DoGetBestSize() const;
+
+   // create the control of the given class with the given style, returns FALSE
+   // if creation failed
+   //
+   // All parameters except classname and style are optional, if the
+   // size/position are not given, they should be set later with SetSize() and,
+   // label (the title of the window), of course, is left empty. The extended
+   // style is determined from the style and the app 3D settings automatically
+   // if it's not specified explicitly.
+   bool MSWCreateControl(const wxChar *classname,
+                         WXDWORD style,
+                         const wxPoint& pos = wxDefaultPosition,
+                         const wxSize& size = wxDefaultSize,
+                         const wxString& label = wxEmptyString,
+                         WXDWORD exstyle = (WXDWORD)-1);
+
+   // determine the extended styles combination for this window (may slightly
+   // modify style parameter, this is why it's non const)
+   WXDWORD GetExStyle(WXDWORD& style, bool *want3D) const;
 
 private:
    DECLARE_EVENT_TABLE()
@@ -78,8 +103,8 @@ private:
 
 #if WXWIN_COMPATIBILITY
     inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
-    inline wxFont& wxControl::GetLabelFont() const { return GetFont() ; }
-    inline wxFont& wxControl::GetButtonFont() const { return GetFont() ; }
+    inline wxFont& wxControl::GetLabelFont() const { return GetFont(); }
+    inline wxFont& wxControl::GetButtonFont() const { return GetFont(); }
     inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
     inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif // WXWIN_COMPATIBILITY