wxChoicebook generic implementation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/chkconf.h

@@ -291,6 +291,14 @@
 #   endif
 #endif /* !defined(wxUSE_CHOICE) */
 
+#ifndef wxUSE_CHOICEBOOK
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CHOICEBOOK must be defined."
+#   else
+#       define wxUSE_CHOICEBOOK 0
+#   endif
+#endif /* !defined(wxUSE_CHOICEBOOK) */
+
 #ifndef wxUSE_CHOICEDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CHOICEDLG must be defined."
@@ -957,7 +965,7 @@
 #    endif
 #endif /* wxUSE_BMPBUTTON */
 
-#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK
+#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK || wxUSE_CHOICEBOOK
 #   if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxUSE_BOOKCTRL must be set."
@@ -982,6 +990,17 @@
 #   endif
 #endif /* wxUSE_LISTBOOK */
 
+#if wxUSE_CHOICEBOOK
+#   if !wxUSE_CHOICE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxChoicebook requires wxChoice"
+#       else
+#           undef wxUSE_CHOICE
+#           define wxUSE_CHOICE 1
+#       endif
+#   endif
+#endif /* wxUSE_CHOICEBOOK */
+
 /* wxUniv-specific dependencies */
 #if defined(__WXUNIVERSAL__)
 #   if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN

include/wx/choicebk.h

@@ -0,0 +1,170 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/choicebk.h
+// Purpose:     wxChoicebook: wxChoice and wxNotebook combination
+// Author:      Vadim Zeitlin
+// Modified by: Wlodzimierz ABX Skiba from wx/listbook.h
+// Created:     15.09.04
+// RCS-ID:      $Id$
+// Copyright:   (c) Vadim Zeitlin, Wlodzimierz Skiba
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#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"
+
+class WXDLLEXPORT wxChoice;
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// wxChoicebook styles
+enum
+{
+    // default alignment: top everywhere
+    wxCHB_DEFAULT = 0,
+
+    // put the choice control to the left/right/top/bottom of the page area
+    wxCHB_TOP    = 0x1,
+    wxCHB_BOTTOM = 0x2,
+    wxCHB_LEFT   = 0x4,
+    wxCHB_RIGHT  = 0x8,
+
+    // the mask which can be used to extract the alignment from the style
+    wxCHB_ALIGN_MASK = 0xf
+};
+
+// ----------------------------------------------------------------------------
+// wxChoicebook
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxChoicebook : public wxBookCtrl
+{
+public:
+    wxChoicebook()
+    {
+        Init();
+    }
+
+    wxChoicebook(wxWindow *parent,
+                 wxWindowID id,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxString& name = wxEmptyString)
+    {
+        Init();
+
+        (void)Create(parent, id, pos, size, style, name);
+    }
+
+    // quasi ctor
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxEmptyString);
+
+
+    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 SetPageImage(size_t n, int imageId);
+    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
+    virtual bool InsertPage(size_t n,
+                            wxWindow *page,
+                            const wxString& text,
+                            bool bSelect = false,
+                            int imageId = -1);
+    virtual int SetSelection(size_t n);
+    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();
+
+protected:
+    virtual wxWindow *DoRemovePage(size_t page);
+
+private:
+    // common part of all constructors
+    void Init();
+
+    // get the size which the choice control should have
+    wxSize GetChoiceSize() const;
+
+    // get the page area
+    wxRect GetPageRect() const;
+
+    // event handlers
+    void OnSize(wxSizeEvent& 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;
+
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook)
+};
+
+// ----------------------------------------------------------------------------
+// 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)
+    {
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebookEvent)
+};
+
+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,                                                                     \
+    -1,                                                                     \
+    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
+    NULL                                                                    \
+  ),
+
+#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn)                                \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \
+    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,                                   \
+    id,                                                                     \
+    -1,                                                                     \
+    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
+    NULL                                                                    \
+  ),
+
+#endif // wxUSE_CHOICEBOOK
+
+#endif // _WX_CHOICEBOOK_H_

include/wx/mac/setup0.h

@@ -127,7 +127,7 @@
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 // this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for mingw / cygwin 
+// ignored for mingw / cygwin
 //
 // Default is 0
 //
@@ -542,6 +542,14 @@
 // Recommended setting: 1
 #define wxUSE_LISTBOOK 1
 
+// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_CHOICEBOOK 1
+
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.
 //
@@ -768,7 +776,7 @@
 // wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to embed
 // the Safari browser control
 // 0 by default because of Jaguar compatibility problems
-#define wxUSE_WEBKIT	0
+#define wxUSE_WEBKIT        0
 
 // OpenGL canvas
 #define wxUSE_GLCANVAS       0

include/wx/msw/setup0.h

@@ -573,6 +573,14 @@
 // Recommended setting: 1
 #define wxUSE_LISTBOOK 1
 
+// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_CHOICEBOOK 1
+
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.
 //

include/wx/msw/wince/setup.h

@@ -565,6 +565,14 @@
 // Recommended setting: 1
 #define wxUSE_LISTBOOK 1
 
+// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_CHOICEBOOK 1
+
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.
 //
@@ -905,7 +913,7 @@
 // that use the connection) should support forward only scrolling of cursors,
 // or both forward and backward support for backward scrolling cursors is
 // dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS	 1
+#define wxODBC_FWD_ONLY_CURSORS     1
 
 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
 // member variables.  With a setting of 1, full backward compatability with the

include/wx/os2/setup0.h

@@ -123,6 +123,7 @@
 #define wxUSE_MSGDLG       1
 #define wxUSE_NOTEBOOK     1
 #define wxUSE_LISTBOOK     1
+#define wxUSE_CHOICEBOOK   1
 #define wxUSE_SPLITTER     1
 #define wxUSE_STOPWATCH    1
 #define wxUSE_TAB_DIALOG   1
@@ -201,7 +202,7 @@
 #define wxUSE_ODBC                1
                                   // Define 1 to use ODBC classes
 
-#define wxODBC_FWD_ONLY_CURSORS	1
+#define wxODBC_FWD_ONLY_CURSORS   1
                                   // For backward compatibility reasons, this parameter now only
                                   // controls the default scrolling method used by cursors.  This
                                   // default behavior can be overriden by setting the second param

include/wx/sizer.h

@@ -543,7 +543,7 @@ private:
 
 #if wxUSE_BOOKCTRL
 
-// this sizer works with wxNotebook/wxListbook/... and sizes the control to
+// this sizer works with wxNotebook/wxListbook/wxChoicebook... and sizes the control to
 // fit its pages
 class WXDLLEXPORT wxBookCtrl;
 

include/wx/univ/setup0.h

@@ -605,6 +605,14 @@
 // Recommended setting: 1
 #define wxUSE_LISTBOOK 1
 
+// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_CHOICEBOOK 1
+
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.
 //