X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..c07103f267adc57a49d2fffa12acdd06b3ff7a57:/include/wx/msw/choice.h

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index c2b47f69c5..4661025fe9 100644
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase
 {
 public:
     // ctors
-    wxChoice() { }
+    wxChoice() { Init(); }
     virtual ~wxChoice();
 
     wxChoice(wxWindow *parent,
@@ -36,9 +36,23 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {
+        Init();
         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)
+    {
+        Init();
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
@@ -47,6 +61,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);
@@ -56,6 +78,9 @@ public:
 
     virtual int GetCount() const;
     virtual int GetSelection() const;
+#if wxABI_VERSION >= 20602
+    virtual int GetCurrentSelection() const;
+#endif
     virtual void SetSelection(int n);
 
     virtual int FindString(const wxString& s) const;
@@ -64,11 +89,13 @@ 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, WXHWND hWnd);
 
 protected:
+    // common part of all ctors
+    void Init() { m_lastAcceptedSelection = wxID_NONE; }
+
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
@@ -77,13 +104,38 @@ 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();
 
+
+    // last "completed" selection, i.e. not the transient one while the user is
+    // browsing the popup list: this is only used when != wxID_NONE which is
+    // the case while the drop down is opened
+    int m_lastAcceptedSelection;
+
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
 };