X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ed64378076af9e28d1c3f896d4b85bdc6aa1b2a..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/control.h?ds=sidebyside diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 16c7419422..01d09f4832 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -15,7 +15,7 @@ #include "wx/dynarray.h" // General item class -class WXDLLEXPORT wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl() { } @@ -35,7 +35,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxControlNameStr); - virtual ~wxControl(); // Simulates an event virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } @@ -59,8 +58,8 @@ public: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); // For ownerdraw items - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }; - virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; }; + virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; } + virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; } const wxArrayLong& GetSubcontrols() const { return m_subControls; } @@ -68,6 +67,9 @@ public: // could call it virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd); + // default style for the control include WS_TABSTOP if it AcceptsFocus() + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + protected: // choose the default border for this window virtual wxBorder GetDefaultBorder() const; @@ -111,9 +113,6 @@ protected: 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; - // call this from the derived class MSWControlColor() if you want to show // the control greyed out (and opaque) WXHBRUSH MSWControlColorDisabled(WXHDC pDC); @@ -123,13 +122,6 @@ protected: // one virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd); - // 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;