Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 8ad3f4448b8b1572048cc0518c88baed345ed160..02ae7e481a996a1c9e3a39f38c09516604d908af 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -11,17 +11,23 @@
 #ifndef _WX_GTK_COMBOBOX_H_
 #define _WX_GTK_COMBOBOX_H_
 
 #ifndef _WX_GTK_COMBOBOX_H_
 #define _WX_GTK_COMBOBOX_H_
 

+#include "wx/choice.h"
+

 typedef struct _GtkEntry GtkEntry;
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 typedef struct _GtkEntry GtkEntry;
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxComboBox : public wxControl,
-                                    public wxComboBoxBase
+class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
+                                    public wxTextEntry

 {
 public:
 {
 public:

-    wxComboBox() { m_strings = NULL; }
+    wxComboBox()
+        : wxChoice(), wxTextEntry()
+    {
+        Init();
+    }

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


@@ -31,7 +37,9 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr)
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr)

+        : wxChoice(), wxTextEntry()

     {
     {

+        Init();

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


@@ -43,12 +51,12 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr)
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr)

+        : wxChoice(), wxTextEntry()

     {
     {

+        Init();

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

-    virtual ~wxComboBox();
-

     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,


@@ -66,36 +74,37 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
 

-    // From wxItemContainerImmutable:
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString &text);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual void SetSelection(int n);
-    virtual int GetSelection() const;
+    // Set/GetSelection() from wxTextEntry and wxChoice

 
 

-    // from wxTextEntry: we need to override them to avoid virtual function
-    // hiding
+    virtual void SetSelection(int n) { wxChoice::SetSelection(n); }

     virtual void SetSelection(long from, long to)
     virtual void SetSelection(long from, long to)

-    {
-        wxTextEntry::SetSelection(from, to);
-    }
+                               { wxTextEntry::SetSelection(from, to); }

 
 

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

     virtual void GetSelection(long *from, long *to) const
     virtual void GetSelection(long *from, long *to) const

-    {
-        return wxTextEntry::GetSelection(from, to);
-    }
+                               { return wxTextEntry::GetSelection(from, to); }

 
     virtual wxString GetStringSelection() const
     {
         return wxItemContainer::GetStringSelection();
     }
 
     virtual wxString GetStringSelection() const
     {
         return wxItemContainer::GetStringSelection();
     }

+    virtual void Popup();
+    virtual void Dismiss();
+
+    virtual void Clear()
+    {
+        wxTextEntry::Clear();
+        wxItemContainer::Clear();
+    }

 
 

-    // From wxComboBoxBase:
-    virtual int GetCurrentSelection() const;
+    // See wxComboBoxBase discussion of IsEmpty().
+    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }

 
     void OnChar( wxKeyEvent &event );
 
 
     void OnChar( wxKeyEvent &event );
 

+    virtual void SetValue(const wxString& value);
+

     // Standard event handling
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
     // Standard event handling
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);


@@ -113,59 +122,37 @@ public:
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 

-    bool           m_ignoreNextUpdate:1;
-    wxArrayPtrVoid m_clientData;
-    int            m_prevSelection;
-
-    void DisableEvents();
-    void EnableEvents();
+    virtual void GTKDisableEvents();
+    virtual void GTKEnableEvents();

     GtkWidget* GetConnectWidget();
 
     GtkWidget* GetConnectWidget();
 

-    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

-    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
-

 protected:
     // From wxWindowGTK:
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 protected:
     // From wxWindowGTK:
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 

-    // From wxItemContainer:
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void* DoGetItemClientData(unsigned int n) const;
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
-
-    // From wxControl:
-    virtual wxSize DoGetBestSize() const;
-

     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 

-    // return the GtkEntry part of the combobox
-    GtkEntry *GetEntry() const;
+    // Override in derived classes to create combo box widgets with
+    // custom list stores.
+    virtual void GTKCreateComboBoxWidget();
+
+    virtual GtkEntry *GetEntry() const
+        { return m_entry; }
+
+    GtkEntry*   m_entry;

 
 private:
     // From wxTextEntry:
 
 private:
     // From wxTextEntry:

-    virtual const wxWindow *GetEditableWindow() const { return this; }
+    virtual wxWindow *GetEditableWindow() { return this; }

     virtual GtkEditable *GetEditable() const;
     virtual GtkEditable *GetEditable() const;

-    virtual void EnableTextChangedEvents(bool enable)
-    {
-        if ( enable )
-            EnableEvents();
-        else
-            DisableEvents();
-    }
+    virtual void EnableTextChangedEvents(bool enable);

 
 

-    // this array is only used for controls with wxCB_SORT style, so only
-    // allocate it if it's needed (hence using pointer)
-    wxSortedArrayString *m_strings;
+    void Init();

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()