Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

[wxWidgets.git] / include / wx / msw / choice.h

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index e6207d187d8674c7851e6701e2f14bf6c4abecdd..c5cf8125bec33d370412ffa1a8c7cce81e023332 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -16,7 +16,7 @@
 // Choice item
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
 {
 public:
     // ctors
@@ -66,17 +66,24 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
-    virtual void Delete(int n);
-    virtual void Clear();
+    virtual void SetLabel(const wxString& label);
 
-    virtual int GetCount() const;
+    virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
     virtual int GetCurrentSelection() const;
     virtual void SetSelection(int n);
 
     virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);
+
+    virtual wxVisualAttributes GetDefaultAttributes() const
+    {
+        return GetClassDefaultAttributes(GetWindowVariant());
+    }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
@@ -85,17 +92,30 @@ public:
     virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+
 protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // common part of all ctors
-    void Init() { m_lastAcceptedSelection = wxID_NONE; }
+    void Init()
+    {
+        m_lastAcceptedSelection = wxID_NONE;
+        m_heightOwn = wxDefaultCoord;
+    }
+
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
 
-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, int pos);
     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;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
 
     // MSW implementation
     virtual wxSize DoGetBestSize() const;
@@ -106,7 +126,10 @@ protected:
 
     // update the height of the drop down list to fit the number of items we
     // have (without changing the visible height)
-    void UpdateVisibleHeight();
+    void MSWUpdateDropDownHeight();
+
+    // set the height of the visible part of the control to m_heightOwn
+    void MSWUpdateVisibleHeight();
 
     // create and initialize the control
     bool CreateAndInit(wxWindow *parent, wxWindowID id,
@@ -120,12 +143,21 @@ protected:
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
+    // set the height for simple combo box
+    int SetHeightSimpleComboBox(int nItems) const;
+
+#if wxUSE_DEFERRED_SIZING
+    virtual void MSWEndDeferWindowPos();
+#endif // wxUSE_DEFERRED_SIZING
 
     // 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;
 
+    // the height of the control itself if it was set explicitly or
+    // wxDefaultCoord if it hadn't
+    int m_heightOwn;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
 };