SetTextColour is gone

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

diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h
index f5b6fc8f1eefd7b692260bdcf0bb9fdf7053c3d7..f829b796b4c579c8fa6ef8d418c9cc23d316c2c6 100644 (file)
--- a/include/wx/toolbook.h
+++ b/include/wx/toolbook.h
@@ -21,6 +21,13 @@
 class WXDLLEXPORT wxToolBarBase;
 class WXDLLEXPORT wxCommandEvent;
 
 class WXDLLEXPORT wxToolBarBase;
 class WXDLLEXPORT wxCommandEvent;
 

+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING;
+
+
+// Use wxButtonToolBar
+#define wxBK_BUTTONBAR            0x0100
+

 // ----------------------------------------------------------------------------
 // wxToolbook
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxToolbook
 // ----------------------------------------------------------------------------


@@ -54,6 +61,7 @@ public:
                 const wxString& name = wxEmptyString);
 
 
                 const wxString& name = wxEmptyString);
 
 

+    // implement base class virtuals

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


@@ -65,15 +73,21 @@ public:
                             const wxString& text,
                             bool bSelect = false,
                             int imageId = -1);
                             const wxString& text,
                             bool bSelect = false,
                             int imageId = -1);

-    virtual int SetSelection(size_t n);
+    virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
+    virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }

     virtual void SetImageList(wxImageList *imageList);
 
     virtual bool DeleteAllPages();
     virtual void SetImageList(wxImageList *imageList);
 
     virtual bool DeleteAllPages();

+    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
+

 
 

+    // methods which are not part of base wxBookctrl API
+
+    // get the underlying toolbar

     wxToolBarBase* GetToolBar() const { return (wxToolBarBase*)m_bookctrl; }
 
     wxToolBarBase* GetToolBar() const { return (wxToolBarBase*)m_bookctrl; }
 

-    // Not part of the wxBookctrl API, but must be called in OnIdle or
-    // by application to realize the toolbar and select the initial page.
+    // must be called in OnIdle or by application to realize the toolbar and
+    // select the initial page.

     void Realize();
 
 protected:
     void Realize();
 
 protected:


@@ -87,6 +101,11 @@ protected:
     void OnSize(wxSizeEvent& event);
     void OnIdle(wxIdleEvent& event);
 
     void OnSize(wxSizeEvent& event);
     void OnIdle(wxIdleEvent& event);
 

+    void UpdateSelectedPage(size_t newsel);
+
+    wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
+    void MakeChangedEvent(wxBookCtrlBaseEvent &event);
+

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


@@ -94,7 +113,7 @@ protected:
     bool m_needsRealizing;
 
     // maximum bitmap size
     bool m_needsRealizing;
 
     // maximum bitmap size

-    wxSize  m_maxBitmapSize;
+    wxSize m_maxBitmapSize;

 
 private:
     // common part of all constructors
 
 private:
     // common part of all constructors


@@ -128,9 +147,6 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxToolbookEvent)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxToolbookEvent)
 };
 

-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED;
-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING;
-

 typedef void (wxEvtHandler::*wxToolbookEventFunction)(wxToolbookEvent&);
 
 #define wxToolbookEventHandler(func) \
 typedef void (wxEvtHandler::*wxToolbookEventFunction)(wxToolbookEvent&);
 
 #define wxToolbookEventHandler(func) \