X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..8850cbd3c3f4e714e6883d3ff8e4ac58144427bc:/include/wx/msw/combobox.h diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index d143bdf367..dd03fe6e78 100644 --- a/include/wx/msw/combobox.h +++ b/include/wx/msw/combobox.h @@ -12,7 +12,7 @@ #ifndef _WX_COMBOBOX_H_ #define _WX_COMBOBOX_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "combobox.h" #endif @@ -26,10 +26,8 @@ class WXDLLEXPORT wxComboBox: public wxChoice { - DECLARE_DYNAMIC_CLASS(wxComboBox) - public: - wxComboBox() { } + wxComboBox() { Init(); } wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -40,8 +38,23 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { + Init(); + Create(parent, id, value, pos, size, n, choices, style, validator, name); } + wxComboBox(wxWindow *parent, wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr) + { + Init(); + + Create(parent, id, value, pos, size, choices, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, @@ -53,11 +66,20 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr); // List functions: see wxChoice // Text field functions - wxString GetValue() const { return GetLabel(); } + wxString GetValue() const { return m_value; } virtual void SetValue(const wxString& value); // Clipboard operations @@ -77,10 +99,28 @@ public: // implementation only from now on virtual bool MSWCommand(WXUINT param, WXWORD id); bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXHWND GetEditHWND() const; + +protected: + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + + // common part of all ctors + void Init() { m_selectionOld = -1; } + + + // the previous selection (see MSWCommand() to see why it is needed) + int m_selectionOld; + + // the current selection (also see MSWCommand()) + wxString m_value; + +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox) }; #endif // wxUSE_COMBOBOX