fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 39bbb7ed548b924cb552ed31413a30e1690cb4cc..0ec684d85efc053abecc80b208a56d6006778f92 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -26,20 +26,20 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxComboBox;
+class WXDLLIMPEXP_CORE wxComboBox;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-extern const wxChar* wxComboBoxNameStr;
-extern const wxChar* wxEmptyString;
+extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr;
+extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;

 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 

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

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


@@ -90,13 +90,14 @@ public:
 
     virtual int FindString( const wxString &item ) const;
     int GetSelection() const;
 
     virtual int FindString( const wxString &item ) const;
     int GetSelection() const;

+#if wxABI_VERSION >= 20602
+    int GetCurrentSelection() const;
+#endif

     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
     int GetCount() const;
     int Number() const { return GetCount(); }
     void SetSelection( int n );
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
     int GetCount() const;
     int Number() const { return GetCount(); }
     void SetSelection( int n );

-    void Select( int n ) { return SetSelection( n ); }
-    bool SetStringSelection( const wxString &string );

     void SetString(int n, const wxString &text);
 
     wxString GetValue() const;
     void SetString(int n, const wxString &text);
 
     wxString GetValue() const;


@@ -105,14 +106,25 @@ public:
     void Copy();
     void Cut();
     void Paste();
     void Copy();
     void Cut();
     void Paste();

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

     void SetInsertionPoint( long pos );
     void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
     long GetInsertionPoint() const;
     void SetInsertionPoint( long pos );
     void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
     long GetInsertionPoint() const;

-    long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;

     void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
     void Replace( long from, long to, const wxString& value );
     void SetSelection( long from, long to );
     void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
     void Replace( long from, long to, const wxString& value );
     void SetSelection( long from, long to );

+    void GetSelection( long* from, long* to ) const;

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

+    void Undo() ;
+    void Redo() ;
+    bool CanUndo() const;
+    bool CanRedo() const;
+    void SelectAll();
+    bool IsEditable() const ;
+    bool HasSelection() const ;

 
     // implementation
 
 
     // implementation
 


@@ -121,7 +133,24 @@ public:
     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
 
     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
 

-    bool     m_alreadySent;
+    // 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);
+
+    bool     m_ignoreNextUpdate:1;

     wxList   m_clientDataList;
     wxList   m_clientObjectList;
     int      m_prevSelection;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
     int      m_prevSelection;


@@ -130,13 +159,13 @@ public:
     void EnableEvents();
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void EnableEvents();
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

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

-    
+

 protected:
     virtual int DoAppend(const wxString& item);
     virtual int DoInsert(const wxString& item, int pos);
 protected:
     virtual int DoAppend(const wxString& item);
     virtual int DoInsert(const wxString& item, int pos);