porting reordering of controls back from 2.8

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 9cb4f9f1854f22d39c959a56b54bbabec31fdd6b..8ad3f4448b8b1572048cc0518c88baed345ed160 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -11,6 +11,8 @@
 #ifndef _WX_GTK_COMBOBOX_H_
 #define _WX_GTK_COMBOBOX_H_
 
 #ifndef _WX_GTK_COMBOBOX_H_
 #define _WX_GTK_COMBOBOX_H_
 

+typedef struct _GtkEntry GtkEntry;
+

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


@@ -92,9 +94,6 @@ public:
     // From wxComboBoxBase:
     virtual int GetCurrentSelection() const;
 
     // From wxComboBoxBase:
     virtual int GetCurrentSelection() const;
 

-    virtual void SetFocus();
-
-    void OnSize( wxSizeEvent &event );

     void OnChar( wxKeyEvent &event );
 
     // Standard event handling
     void OnChar( wxKeyEvent &event );
 
     // Standard event handling


@@ -131,7 +130,6 @@ public:
 
 protected:
     // From wxWindowGTK:
 
 protected:
     // From wxWindowGTK:

-    virtual void DoApplyWidgetStyle(GtkRcStyle *style);

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


@@ -150,6 +148,9 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 

+    // return the GtkEntry part of the combobox
+    GtkEntry *GetEntry() const;
+

 private:
     // From wxTextEntry:
     virtual const wxWindow *GetEditableWindow() const { return this; }
 private:
     // From wxTextEntry:
     virtual const wxWindow *GetEditableWindow() const { return this; }