Fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case.

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

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index 4eb0652e81a9cb593b572ae12c0729014cf00381..6c9f7d4980229b65276404d6c59adfe99b781011 100644 (file)
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -18,6 +18,7 @@
 
 #include "wx/bookctrl.h"
 #include "wx/choice.h"
+#include "wx/containr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxChoice;
 
@@ -36,7 +37,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGI
 // wxChoicebook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxChoicebook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxChoicebook : public wxNavigationEnabled<wxBookCtrlBase>
 {
 public:
     wxChoicebook() { }
@@ -68,7 +69,7 @@ public:
                             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); }
@@ -79,6 +80,11 @@ public:
     // returns the choice control
     wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
 
+    // Override this to return true because the part of parent window
+    // background between our controlling wxChoice and the page area should
+    // show through.
+    virtual bool HasTransparentBackground() { return true; }
+
 protected:
     virtual void DoSetWindowVariant(wxWindowVariant variant);
 
@@ -106,7 +112,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // wxChoicebookEvent is obsolete and defined for compatibility only
-typedef wxBookCtrlEvent wxChoicebookEvent;
+#define wxChoicebookEvent wxBookCtrlEvent
 typedef wxBookCtrlEventFunction wxChoicebookEventFunction;
 #define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func)