Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index ec7d272651105ed1230d639440615db08b3533d2..a6c5703efc8f7922a3c288ac3779208b17307aa9 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to derive from wxChoiceBase
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to derive from wxChoiceBase
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,6 +11,8 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

+struct tagCOMBOBOXINFO;
+

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


@@ -66,6 +67,8 @@ 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 void SetLabel(const wxString& label);
 
     virtual unsigned int GetCount() const;


@@ -102,7 +105,8 @@ protected:
     // common part of all ctors
     void Init()
     {
     // common part of all ctors
     void Init()
     {

-        m_lastAcceptedSelection = wxID_NONE;
+        m_lastAcceptedSelection =
+        m_pendingSelection = wxID_NONE;

         m_heightOwn = wxDefaultCoord;
     }
 
         m_heightOwn = wxDefaultCoord;
     }
 


@@ -123,6 +127,7 @@ 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);
 
     // Show or hide the popup part of the control.
     void MSWDoPopupOrDismiss(bool show);


@@ -134,6 +139,10 @@ protected:
     // set the height of the visible part of the control to m_heightOwn
     void MSWUpdateVisibleHeight();
 
     // 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,
                        const wxPoint& pos,
     // create and initialize the control
     bool CreateAndInit(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,


@@ -153,10 +162,13 @@ protected:
     virtual void MSWEndDeferWindowPos();
 #endif // 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
 
     // the height of the control itself if it was set explicitly or
     // wxDefaultCoord if it hadn't