Compilation fix.

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

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index aa38ecd8954dd38763f961dec99936195d92466d..c80a2d7123f58e4545be3c090881f1789c013735 100644 (file)
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -64,10 +64,6 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
 

-    // implement base class pure virtuals
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
-

     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);


@@ -77,6 +73,8 @@ public:
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 

+    virtual void EnsureVisible(int n);
+

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


@@ -102,6 +100,8 @@ public:
     void GtkSetSelection(int n, const bool select, const bool blockEvent);
 
 protected:
     void GtkSetSelection(int n, const bool select, const bool blockEvent);
 
 protected:

+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);

     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;


@@ -126,6 +126,9 @@ protected:
     // set the specified item
     void GtkSetItem(_GtkTreeIter& iter, const _GtkTreeEntry *entry);
 
     // set the specified item
     void GtkSetItem(_GtkTreeIter& iter, const _GtkTreeEntry *entry);
 

+    // common part of DoSetFirstItem() and EnsureVisible()
+    void DoScrollToCell(int n, float alignY, float alignX);
+

 private:
     void Init(); //common construction
 
 private:
     void Init(); //common construction