rename wxGrid::SendSizeEvent() to SendGridSizeEvent() to avoid warnings about conflic...

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

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index db67bd1220fac5fc08305993fcca2c0b761d6cc9..4daa5b28fff19e04acedba7b88308396d177115c 100644 (file)
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -12,23 +12,31 @@
 #ifndef _WX_CHOICEBOOK_H_
 #define _WX_CHOICEBOOK_H_
 
 #ifndef _WX_CHOICEBOOK_H_
 #define _WX_CHOICEBOOK_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "choicebook.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_CHOICEBOOK
 
 #include "wx/bookctrl.h"
 #include "wx/defs.h"
 
 #if wxUSE_CHOICEBOOK
 
 #include "wx/bookctrl.h"

+#include "wx/choice.h"
+
+class WXDLLIMPEXP_FWD_CORE wxChoice;

 
 

-class WXDLLEXPORT wxChoice;
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+
+// wxChoicebook flags
+#define wxCHB_DEFAULT          wxBK_DEFAULT
+#define wxCHB_TOP              wxBK_TOP
+#define wxCHB_BOTTOM           wxBK_BOTTOM
+#define wxCHB_LEFT             wxBK_LEFT
+#define wxCHB_RIGHT            wxBK_RIGHT
+#define wxCHB_ALIGN_MASK       wxBK_ALIGN_MASK

 
 // ----------------------------------------------------------------------------
 // wxChoicebook
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxChoicebook
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxChoicebook : public wxBookCtrl
+class WXDLLIMPEXP_CORE wxChoicebook : public wxBookCtrlBase

 {
 public:
     wxChoicebook()
 {
 public:
     wxChoicebook()


@@ -68,30 +76,36 @@ 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 void SetImageList(wxImageList *imageList);
 

-    // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style
-    bool IsVertical() const { return HasFlag(wxCHB_BOTTOM | wxCHB_TOP); }
-

     virtual bool DeleteAllPages();
 
     virtual bool DeleteAllPages();
 

+    // returns the choice control
+    wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
+

 protected:
 protected:

+    virtual void DoSetWindowVariant(wxWindowVariant variant);
+

     virtual wxWindow *DoRemovePage(size_t page);
 
     // get the size which the choice control should have
     virtual wxWindow *DoRemovePage(size_t page);
 
     // get the size which the choice control should have

-    wxSize GetChoiceSize() const;
+    virtual wxSize GetControllerSize() const;
+
+    void UpdateSelectedPage(size_t newsel)
+    {
+        m_selection = static_cast<int>(newsel);
+        GetChoiceCtrl()->Select(m_selection);
+    }

 
 

-    // get the page area
-    wxRect GetPageRect() const;
+    wxBookCtrlEvent* CreatePageChangingEvent() const;
+    void MakeChangedEvent(wxBookCtrlEvent &event);

 
     // event handlers
 
     // event handlers

-    void OnSize(wxSizeEvent& event);

     void OnChoiceSelected(wxCommandEvent& event);
 
     void OnChoiceSelected(wxCommandEvent& event);
 

-    // the choice control we use for showing the pages index
-    wxChoice *m_choice;
-

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


@@ -107,41 +121,16 @@ private:
 // choicebook event class and related stuff
 // ----------------------------------------------------------------------------
 
 // choicebook event class and related stuff
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlEvent
-{
-public:
-    wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
-                      int nSel = -1, int nOldSel = -1)
-        : wxBookCtrlEvent(commandType, id, nSel, nOldSel)
-    {
-    }
+// wxChoicebookEvent is obsolete and defined for compatibility only
+typedef wxBookCtrlEvent wxChoicebookEvent;
+typedef wxBookCtrlEventFunction wxChoicebookEventFunction;
+#define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func)

 
 

-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebookEvent)
-};
+#define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))

 
 

-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;
-
-typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
-
-#define EVT_CHOICEBOOK_PAGE_CHANGED(id, fn)                                 \
-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,                                  \
-    id,                                                                     \
-    wxID_ANY,                                                               \
-    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
-    NULL                                                                    \
-  ),
-
-#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn)                                \
-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,                                 \
-    id,                                                                     \
-    wxID_ANY,                                                               \
-    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
-    NULL                                                                    \
-  ),
+#define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))

 
 #endif // wxUSE_CHOICEBOOK
 
 
 #endif // wxUSE_CHOICEBOOK