X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d772832a04a3d2380ac6b3ffea6bfe6a72dcff6..5d644707ca96dcaa63dc5a24c9eb5c2b7ee0b50d:/include/wx/msw/control.h diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index e63718755f..e5e7f5c918 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -18,8 +18,6 @@ #include "wx/dynarray.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; - // General item class class WXDLLEXPORT wxControl : public wxControlBase { @@ -30,9 +28,7 @@ public: wxControl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS const wxValidator& validator = wxDefaultValidator, -#endif const wxString& name = wxControlNameStr) { Create(parent, id, pos, size, style, validator, name); @@ -41,91 +37,100 @@ public: bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS const wxValidator& validator = wxDefaultValidator, -#endif const wxString& name = wxControlNameStr); virtual ~wxControl(); - // Simulates an event - virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } + // Simulates an event + virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } - // implementation from now on - // -------------------------- + // implementation from now on + // -------------------------- - // Calls the callback and appropriate event handlers - bool ProcessCommand(wxCommandEvent& event); + // Calls the callback and appropriate event handlers + bool ProcessCommand(wxCommandEvent& event); - // MSW-specific + // MSW-specific #ifdef __WIN95__ - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + 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; }; + // For ownerdraw items + virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; }; + virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; }; - wxArrayLong GetSubcontrols() { return m_subControls; } + wxArrayLong GetSubcontrols() { return m_subControls; } - void OnEraseBackground(wxEraseEvent& event); + void OnEraseBackground(wxEraseEvent& event); - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + 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; } + virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { } + wxColour* GetButtonColour() const { return NULL; } - inline virtual void SetLabelFont(const wxFont& font); - inline virtual void SetButtonFont(const wxFont& font); - inline wxFont& GetLabelFont() const; - inline wxFont& GetButtonFont() const; + inline virtual void SetLabelFont(const wxFont& font); + inline virtual void SetButtonFont(const wxFont& font); + inline wxFont& GetLabelFont() const; + inline wxFont& GetButtonFont() const; - // Adds callback - inline void Callback(const wxFunction function); + // Adds callback + inline void Callback(const wxFunction function); - wxFunction GetCallback() { return m_callback; } + wxFunction GetCallback() { return m_callback; } protected: - wxFunction m_callback; // Callback associated with the window + wxFunction m_callback; // Callback associated with the window #endif // WXWIN_COMPATIBILITY protected: - // 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; + // 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 Window class + bool MSWCreateControl(const wxChar *classname, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style); + + // 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; private: - DECLARE_EVENT_TABLE() + 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 wxFont& wxControl::GetLabelFont() const { return (wxFont &)GetFont(); } + inline wxFont& wxControl::GetButtonFont() const { return (wxFont &)GetFont(); } inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); } inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); } #endif // WXWIN_COMPATIBILITY