Use /bin/echo for creation of Mac OS X PkgInfo files.

[wxWidgets.git] / include / wx / listbook.h

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index a4d1d31c17d09a11e5d41d8575520c7996b2d42a..48140dc0bb7dfd5ad269729619a58c36d04acdb0 100644 (file)
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -39,10 +39,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING
 class WXDLLIMPEXP_CORE wxListbook : public wxBookCtrlBase
 {
 public:
 class WXDLLIMPEXP_CORE wxListbook : public wxBookCtrlBase
 {
 public:

-    wxListbook()
-    {
-        Init();
-    }
+    wxListbook() { }

 
     wxListbook(wxWindow *parent,
                wxWindowID id,
 
     wxListbook(wxWindow *parent,
                wxWindowID id,


@@ -51,8 +48,6 @@ public:
                long style = 0,
                const wxString& name = wxEmptyString)
     {
                long style = 0,
                const wxString& name = wxEmptyString)
     {

-        Init();
-

         (void)Create(parent, id, pos, size, style, name);
     }
 
         (void)Create(parent, id, pos, size, style, name);
     }
 


@@ -66,7 +61,6 @@ public:
 
 
     // overridden base class methods
 
 
     // overridden base class methods

-    virtual int GetSelection() const;

     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;
     virtual int GetPageImage(size_t n) const;


@@ -75,7 +69,7 @@ public:
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,

-                            int imageId = -1);
+                            int imageId = NO_IMAGE);

     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
     virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
     virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;


@@ -101,13 +95,7 @@ protected:
     void OnListSelected(wxListEvent& event);
     void OnSize(wxSizeEvent& event);
 
     void OnListSelected(wxListEvent& event);
     void OnSize(wxSizeEvent& event);
 

-    // the currently selected page or wxNOT_FOUND if none
-    int m_selection;
-

 private:
 private:

-    // common part of all constructors
-    void Init();
-

     // this should be called when we need to be relaid out
     void UpdateSize();
 
     // this should be called when we need to be relaid out
     void UpdateSize();