No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 02ae7e481a996a1c9e3a39f38c09516604d908af..c655991e3cc229fe579584f5a465a84464cc06bc 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -56,6 +55,7 @@ public:
         Init();
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
         Init();
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }

+    ~wxComboBox();

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


@@ -88,6 +88,9 @@ public:
     {
         return wxItemContainer::GetStringSelection();
     }
     {
         return wxItemContainer::GetStringSelection();
     }

+
+    virtual void SetString(unsigned int n, const wxString& string);
+

     virtual void Popup();
     virtual void Dismiss();
 
     virtual void Popup();
     virtual void Dismiss();
 


@@ -141,6 +144,8 @@ protected:
     // custom list stores.
     virtual void GTKCreateComboBoxWidget();
 
     // custom list stores.
     virtual void GTKCreateComboBoxWidget();
 

+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+

     virtual GtkEntry *GetEntry() const
         { return m_entry; }
 
     virtual GtkEntry *GetEntry() const
         { return m_entry; }