X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d99be5f5381dad56492da02c2df1c3ec0750926..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/msw/choice.h

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index ca2bb1666d..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,11 +22,10 @@
 
 class WXDLLEXPORT wxChoice : public wxChoiceBase
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
 public:
     // ctors
     wxChoice() { }
+    virtual ~wxChoice();
 
     wxChoice(wxWindow *parent,
              wxWindowID id,
@@ -39,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,
@@ -48,9 +58,18 @@ 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 void DoAppend(const wxString& item);
+    virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, int pos);
     virtual void Delete(int n);
     virtual void Clear();
 
@@ -60,22 +79,48 @@ public:
 
     virtual int FindString(const wxString& s) const;
     virtual wxString GetString(int n) const;
+    virtual void SetString(int n, const wxString& s);
 
     // 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 MSWControlColor(WXHDC hDC);
 
 protected:
-    virtual void DoSetClientData( int n, void* clientData );
-    virtual void* DoGetClientData( int n ) const;
-    virtual void DoSetClientObject( int n, wxClientData* clientData );
-    virtual wxClientData* DoGetClientObject( int n ) const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual void DoSetItemClientData( int n, void* clientData );
+    virtual void* DoGetItemClientData( int n ) const;
+    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
+    virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     // MSW implementation
-    virtual wxSize DoGetBestSize();
+    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_