X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d66a042c1cd17d94d87be0c916edf1264b549abc..0c02f0701e960de4a1f60bc821c19c03b8fc88c3:/include/wx/msw/control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 446d49f333..0856025577 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -12,75 +12,125 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #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)
-
 public:
-   wxControl();
-   virtual ~wxControl();
+    wxControl() { }
 
-   // Simulates an event
-   bool Command(wxCommandEvent& event) { return ProcessCommand(event); }
+    wxControl(wxWindow *parent, wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize, long style = 0,
+              const wxValidator& validator = wxDefaultValidator,
+              const wxString& name = wxControlNameStr)
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
 
-   // Calls the callback and appropriate event handlers
-   bool ProcessCommand(wxCommandEvent& event);
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxControlNameStr);
 
-   // MSW-specific
-#ifdef __WIN95__
-   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-#endif // Win95
+    virtual ~wxControl();
 
-   // For ownerdraw items
-   virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
-   virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
+    // Simulates an event
+    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
 
-   wxList& GetSubcontrols() { return m_subControls; }
 
-   void OnEraseBackground(wxEraseEvent& event);
+    // implementation from now on
+    // --------------------------
 
-#if WXWIN_COMPATIBILITY
-   virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   wxColour* GetButtonColour() const { return NULL; }
+    virtual wxVisualAttributes GetDefaultAttributes() const
+    {
+        return GetClassDefaultAttributes(GetWindowVariant());
+    }
 
-   inline virtual void SetLabelFont(const wxFont& font);
-   inline virtual void SetButtonFont(const wxFont& font);
-   inline wxFont& GetLabelFont() const;
-   inline wxFont& GetButtonFont() const;
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-   // Adds callback
-   inline void Callback(const wxFunction function);
+    // Calls the callback and appropriate event handlers
+    bool ProcessCommand(wxCommandEvent& event);
 
-   wxFunction GetCallback() { return m_callback; }
+    // MSW-specific
+#ifdef __WIN95__
+    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+#endif // Win95
 
-protected:
-   wxFunction       m_callback;     // Callback associated with the window
-#endif // WXWIN_COMPATIBILITY
+    // For ownerdraw items
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
+    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
+
+    const wxArrayLong& GetSubcontrols() const { return m_subControls; }
+
+    void OnEraseBackground(wxEraseEvent& event);
+
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
-   // For controls like radiobuttons which are really composite
-   wxList           m_subControls;
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const;
+
+    // return default best size (doesn't really make any sense, override this)
+    virtual wxSize DoGetBestSize() const;
+
+    // create the control of the given Windows class: this is typically called
+    // from Create() method of the derived class passing its label, pos and
+    // size parameter (style parameter is not needed because m_windowStyle is
+    // supposed to had been already set and so is used instead when this
+    // function is called)
+    bool MSWCreateControl(const wxChar *classname,
+                          const wxString& label,
+                          const wxPoint& pos,
+                          const wxSize& size);
+
+    // NB: the method below is deprecated now, with MSWGetStyle() the method
+    //     above should be used instead! Once all the controls are updated to
+    //     implement MSWGetStyle() this version will disappear.
+    //
+    // create the control of the given class with the given style (combination
+    // of WS_XXX flags, i.e. Windows style, not wxWindows one), 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);
+
+    // default style for the control include WS_TABSTOP if it AcceptsFocus()
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // this is a helper for the derived class GetClassDefaultAttributes()
+    // implementation: it returns the right colours for the classes which
+    // contain something else (e.g. wxListBox, wxTextCtrl, ...) instead of
+    // being simple controls (such as wxButton, wxCheckBox, ...)
+    static wxVisualAttributes
+        GetCompositeControlsDefaultAttributes(wxWindowVariant variant);
+
+
+    // for controls like radiobuttons which are really composite this array
+    // holds the ids (not HWNDs!) of the sub controls
+    wxArrayLong m_subControls;
 
 private:
-   DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
+    DECLARE_EVENT_TABLE()
 };
 
-
-#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 void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
-    inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
-#endif // WXWIN_COMPATIBILITY
-
 #endif
     // _WX_CONTROL_H_