suppress VC7.1 64 bit correctness warnings

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index cd0880a81fa70fb715da9e4ea68074c64b103c20..dd03fe6e7825e89fb0d32a58ae526e4cda9f06d0 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -27,7 +27,7 @@
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
 public:
-    wxComboBox() { }
+    wxComboBox() { Init(); }
 
     wxComboBox(wxWindow *parent, wxWindowID id,
             const wxString& value = wxEmptyString,
@@ -38,6 +38,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
+        Init();
+
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
     wxComboBox(wxWindow *parent, wxWindowID id,
@@ -49,6 +51,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
+        Init();
+
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
@@ -75,7 +79,7 @@ public:
     // List functions: see wxChoice
 
     // Text field functions
-    wxString GetValue() const { return GetLabel(); }
+    wxString GetValue() const { return m_value; }
     virtual void SetValue(const wxString& value);
 
     // Clipboard operations
@@ -105,6 +109,16 @@ public:
 protected:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
+    // common part of all ctors
+    void Init() { m_selectionOld = -1; }
+
+
+    // the previous selection (see MSWCommand() to see why it is needed)
+    int m_selectionOld;
+
+    // the current selection (also see MSWCommand())
+    wxString m_value;
+
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
 };