X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/243dbf1a5088be31980df51b97831b52cb6986cd..8397cab4dafee82a887785a80ab8f588a68d9f27:/include/wx/msw/choice.h diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 9ca576cd7c..5348fd5e26 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -12,7 +12,7 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choice.h" #endif @@ -22,8 +22,6 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase { - DECLARE_DYNAMIC_CLASS(wxChoice) - public: // ctors wxChoice() { } @@ -40,6 +38,17 @@ public: { Create(parent, id, pos, size, n, choices, style, validator, name); } + wxChoice(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr) + { + Create(parent, id, pos, size, choices, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, @@ -49,6 +58,14 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr); // implement base class pure virtuals virtual int DoAppend(const wxString& item); @@ -66,9 +83,8 @@ public: // MSW only virtual bool MSWCommand(WXUINT param, WXWORD id); - long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXHBRUSH MSWControlColor(WXHDC hDC); protected: virtual void DoMoveWindow(int x, int y, int width, int height); @@ -79,12 +95,32 @@ protected: // MSW implementation virtual wxSize DoGetBestSize() const; + virtual void DoGetSize(int *w, int *h) const; virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg); + + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + + // update the height of the drop down list to fit the number of items we + // have (without changing the visible height) + void UpdateVisibleHeight(); + + // create and initialize the control + bool CreateAndInit(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + int n, const wxString choices[], + long style, + const wxValidator& validator, + const wxString& name); + // free all memory we have (used by Clear() and dtor) void Free(); + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice) }; #endif // _WX_CHOICE_H_