added support for user-defined types to wxConfig (patch 1753875)

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index ab5127be3d7f01f525b6dddad707bdfad4b6d094..214b5a4a3ce14da5540ff543aff8f210caffc86c 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -12,25 +12,16 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

-#ifdef __GNUG__
-    #pragma interface "combobox.h"
-#endif
-

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

-WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-

 // ----------------------------------------------------------------------------
 // Combobox control
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
 // ----------------------------------------------------------------------------
 // Combobox control
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxComboBox: public wxChoice
 {

-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-

 public:
     wxComboBox() { }
 
 public:
     wxComboBox() { }
 


@@ -45,6 +36,17 @@ public:
     {
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
     {
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }

+    wxComboBox(wxWindow *parent, wxWindowID id,
+            const wxString& value,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxComboBoxNameStr)
+    {
+        Create(parent, id, value, pos, size, choices, style, validator, name);
+    }

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -56,38 +58,79 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);

+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& value,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);

 
     // List functions: see wxChoice
 
     // Text field functions
 
     // List functions: see wxChoice
 
     // Text field functions

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

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

+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;

     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;

-    virtual long GetLastPosition() const;
+    virtual wxTextPos 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 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 { return wxChoice::GetSelection(); }
+    virtual void GetSelection(long* from, long* to) const;

     virtual void SetEditable(bool editable);
 
     virtual void SetEditable(bool editable);
 

+    virtual void Undo();
+    virtual void Redo();
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+    virtual void SelectAll();
+    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);
     // implementation only from now on
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    bool MSWShouldPreProcessMessage(WXMSG *pMsg);
+    

     WXHWND GetEditHWND() const;
 
     WXHWND GetEditHWND() const;
 

-protected:
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual wxSize DoGetBestSize() const;
+    // 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);
+
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif // wxUSE_COMBOBOX
 };
 
 #endif // wxUSE_COMBOBOX