no real changes, just some cleanup

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 4a841ec05b54efa03e0733ae0f66b20ade6c71fb..214b5a4a3ce14da5540ff543aff8f210caffc86c 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "combobox.h"
-#endif
-

 #include "wx/choice.h"
 
 #if wxUSE_COMBOBOX
 #include "wx/choice.h"
 
 #if wxUSE_COMBOBOX


@@ -27,7 +23,7 @@
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
 public:
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
 public:

-    wxComboBox() { Init(); }
+    wxComboBox() { }

 
     wxComboBox(wxWindow *parent, wxWindowID id,
             const wxString& value = wxEmptyString,
 
     wxComboBox(wxWindow *parent, wxWindowID id,
             const wxString& value = wxEmptyString,


@@ -38,8 +34,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
             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,
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
     wxComboBox(wxWindow *parent, wxWindowID id,


@@ -51,8 +45,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {

-        Init();
-

         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 


@@ -79,7 +71,7 @@ public:
     // List functions: see wxChoice
 
     // Text field functions
     // List functions: see wxChoice
 
     // Text field functions

-    wxString GetValue() const { return m_value; }
+    virtual wxString GetValue() const;

     virtual void SetValue(const wxString& value);
 
     // Clipboard operations
     virtual void SetValue(const wxString& value);
 
     // Clipboard operations


@@ -97,24 +89,24 @@ public:
     virtual void Remove(long from, long to);
     virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
     virtual void SetSelection(long from, long to);
     virtual void Remove(long from, long to);
     virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
     virtual void SetSelection(long from, long to);

-    virtual int GetSelection() const;
+    virtual int GetSelection() const { return wxChoice::GetSelection(); }

     virtual void GetSelection(long* from, long* to) const;
     virtual void SetEditable(bool editable);
     virtual void GetSelection(long* from, long* to) const;
     virtual void SetEditable(bool editable);

-    virtual void Clear() { wxChoice::Clear(); m_selectionOld = -1; }

 
 

-    virtual void Undo() ;
-    virtual void Redo() ;
+    virtual void Undo();
+    virtual void Redo();

     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
     virtual void SelectAll();
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
     virtual void SelectAll();

-    virtual bool IsEditable() const ;
+    virtual bool IsEditable() const;

     virtual bool HasSelection() const;
 
     // implementation only from now on
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     virtual bool HasSelection() const;
 
     // implementation only from now on
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

-
+    bool MSWShouldPreProcessMessage(WXMSG *pMsg);
+    

     WXHWND GetEditHWND() const;
 
     // Standard event handling
     WXHWND GetEditHWND() const;
 
     // Standard event handling


@@ -134,19 +126,8 @@ public:
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 

-protected:

     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     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)
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()