X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f3f9b50aa275243ade3541ecccb95de22cf57a9..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/msw/control.h diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index a8ee1e5075..29897ad9c3 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +14,7 @@ #include "wx/dynarray.h" // General item class -class WXDLLEXPORT wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl() { } @@ -35,7 +34,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxControlNameStr); - virtual ~wxControl(); // Simulates an event virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } @@ -72,6 +70,9 @@ public: virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; protected: + // 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; @@ -120,13 +121,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;