adjust the toolbar tools bitmap size to fit the biggest bitmap used under wxOSX too...

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 3d004d2ab68047ad65e31495cca2b5e90036cb4e..e069ec2a48a20a502c18b21d28b4b763698b8439 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -16,7 +16,7 @@
 // Choice item
 // ----------------------------------------------------------------------------
 
 // Choice item
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -66,8 +66,7 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 

-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
+    virtual void SetLabel(const wxString& label);

 
     virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
 
     virtual unsigned int GetCount() const;
     virtual int GetSelection() const;


@@ -85,9 +84,22 @@ public:
     virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     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:
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // common part of all ctors
     // 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,
 
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,


@@ -106,7 +118,10 @@ protected:
 
     // update the height of the drop down list to fit the number of items we
     // have (without changing the visible height)
 
     // 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,
 
     // create and initialize the control
     bool CreateAndInit(wxWindow *parent, wxWindowID id,


@@ -120,12 +135,18 @@ protected:
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
     // free all memory we have (used by Clear() and dtor)
     void Free();
 

+#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;
 
 
     // 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)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
 };