X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bae4332e74923585bc0843f70bfc11e9759c33b..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/msw/control.h diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index f220821fbb..01d09f4832 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.h +// Name: wx/msw/control.h // Purpose: wxControl class // Author: Julian Smart // Modified by: @@ -12,14 +12,10 @@ #ifndef _WX_CONTROL_H_ #define _WX_CONTROL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "control.h" -#endif - #include "wx/dynarray.h" // General item class -class WXDLLEXPORT wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl() { } @@ -39,7 +35,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxControlNameStr); - virtual ~wxControl(); // Simulates an event virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } @@ -60,13 +55,11 @@ public: bool ProcessCommand(wxCommandEvent& event); // MSW-specific -#ifdef __WIN95__ virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); -#endif // Win95 // 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; } @@ -74,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; @@ -117,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); @@ -129,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;