update to 2.9.0

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 5d1a96acb17143195b2cd32b0e1824d83cd9ae57..6b53f6835e2e82b6371e3508d820720ef61db903 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -12,11 +12,8 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "combobox.h"
-#endif
-
 #include "wx/choice.h"
+#include "wx/textentry.h"
 
 #if wxUSE_COMBOBOX
 
@@ -24,10 +21,11 @@
 // Combobox control
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxComboBox: public wxChoice
+class WXDLLEXPORT wxComboBox : public wxChoice,
+                               public wxTextEntry
 {
 public:
-    wxComboBox() { Init(); }
+    wxComboBox() { }
 
     wxComboBox(wxWindow *parent, wxWindowID id,
             const wxString& value = wxEmptyString,
@@ -38,8 +36,6 @@ 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,
@@ -51,8 +47,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
-        Init();
-
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
@@ -76,56 +70,70 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
 
-    // List functions: see wxChoice
-
-    // Text field functions
-    wxString GetValue() const { return m_value; }
+    // resolve ambiguities among virtual functions inherited from both base
+    // classes
+    virtual void Clear();
+    virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
+    virtual wxString GetStringSelection() const
+        { return wxChoice::GetStringSelection(); }
 
-    // Clipboard operations
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-    virtual void SetInsertionPoint(long pos);
-    virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
-    virtual void Replace(long from, long to, const wxString& value);
-    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 void GetSelection(long* from, long* to) const;
-    virtual void SetEditable(bool editable);
-    virtual void Clear() { wxChoice::Clear(); m_selectionOld = -1; }
+    virtual void SetSelection(long from, long to)
+        { wxTextEntry::SetSelection(from, to); }
+    virtual int GetSelection() const { return wxChoice::GetSelection(); }
+    virtual void GetSelection(long *from, long *to) const;
+
+    virtual bool IsEditable() 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 WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
-    WXHWND GetEditHWND() const;
+    bool MSWShouldPreProcessMessage(WXMSG *pMsg);
+
+    // Standard event handling
+    void OnCut(wxCommandEvent& event);
+    void OnCopy(wxCommandEvent& event);
+    void OnPaste(wxCommandEvent& event);
+    void OnUndo(wxCommandEvent& event);
+    void OnRedo(wxCommandEvent& event);
+    void OnDelete(wxCommandEvent& event);
+    void OnSelectAll(wxCommandEvent& event);
+
+    void OnUpdateCut(wxUpdateUIEvent& event);
+    void OnUpdateCopy(wxUpdateUIEvent& event);
+    void OnUpdatePaste(wxUpdateUIEvent& event);
+    void OnUpdateUndo(wxUpdateUIEvent& event);
+    void OnUpdateRedo(wxUpdateUIEvent& event);
+    void OnUpdateDelete(wxUpdateUIEvent& event);
+    void OnUpdateSelectAll(wxUpdateUIEvent& event);
 
 protected:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-    // common part of all ctors
-    void Init() { m_selectionOld = -1; }
-
+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip(wxToolTip *tip);
+#endif
 
-    // the previous selection (see MSWCommand() to see why it is needed)
-    int m_selectionOld;
+    // this is the overridden wxTextEntry method which should only be called
+    // when we do have an edit control so it asserts if this is not the case
+    virtual WXHWND GetEditHWND() const;
 
-    // the current selection (also see MSWCommand())
-    wxString m_value;
+    // this is the implementation of GetEditHWND() which can also be used when
+    // we don't have the edit control, it simply returns NULL then
+    //
+    // try not to use this function unless absolutely necessary (as in the
+    // message handling code where the edit control might not be created yet
+    // for the messages we receive during the control creation) as normally
+    // just testing for IsEditable() and using GetEditHWND() should be enough
+    WXHWND GetEditHWNDIfAvailable() const;
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // wxUSE_COMBOBOX
-#endif
-    // _WX_COMBOBOX_H_
+
+#endif // _WX_COMBOBOX_H_