Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 402948e08af5e24c0602f27fc16c45cd1caf3778..294605d5277c95c8fa1fe2c98b0b023ac30b8215 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -12,11 +12,13 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

+struct tagCOMBOBOXINFO;
+

 // ----------------------------------------------------------------------------
 // Choice item
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Choice item
 // ----------------------------------------------------------------------------
 

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

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


@@ -66,6 +68,10 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 

+    virtual bool Show(bool show = true);
+
+    virtual void SetLabel(const wxString& label);
+

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


@@ -75,6 +81,14 @@ public:
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned 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);
     WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);


@@ -90,7 +104,12 @@ protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // common part of all ctors
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // common part of all ctors

-    void Init() { m_lastAcceptedSelection = wxID_NONE; }
+    void Init()
+    {
+        m_lastAcceptedSelection =
+        m_pendingSelection = wxID_NONE;
+        m_heightOwn = wxDefaultCoord;
+    }

 
     virtual void DoDeleteOneItem(unsigned int n);
     virtual void DoClear();
 
     virtual void DoDeleteOneItem(unsigned int n);
     virtual void DoClear();


@@ -109,10 +128,21 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+
+    // Show or hide the popup part of the control.
+    void MSWDoPopupOrDismiss(bool show);

 
     // 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();
+
+    // Call GetComboBoxInfo() and return false if it's not supported by this
+    // system. Notice that the caller must initialize info.cbSize.
+    bool MSWGetComboBoxInfo(tagCOMBOBOXINFO* info) const;

 
     // create and initialize the control
     bool CreateAndInit(wxWindow *parent, wxWindowID id,
 
     // create and initialize the control
     bool CreateAndInit(wxWindow *parent, wxWindowID id,


@@ -126,12 +156,24 @@ 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();
 

+    // 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;
+    // These variables are only used while the drop down is opened.
+    //
+    // The first one contains the item that had been originally selected before
+    // the drop down was opened and the second one the item we should select
+    // when the drop down is closed again.
+    int m_lastAcceptedSelection,
+        m_pendingSelection;

 
 

+    // 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)
 };