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 c124543d1535164cd934ef85d51700493d763cf0..294605d5277c95c8fa1fe2c98b0b023ac30b8215 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -106,7 +106,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;
     }
 


@@ -127,6 +128,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);


@@ -161,10 +163,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