X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d99957b6b044289a6fb3872ff9a25ef6d40e574d..2c990ba6d4f88e18e6666f61efe55c7a8b5cc948:/include/wx/msw/choice.h diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index ce9d5b58e2..15b1bb818e 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -83,7 +83,7 @@ public: // MSW only virtual bool MSWCommand(WXUINT param, WXWORD id); - long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); @@ -101,8 +101,22 @@ protected: int width, int height, int sizeFlags = wxSIZE_AUTO); - // get the real height of the control - int GetVisibleHeight() const; + 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();