prevent overload abiguity in wxPyPrintPreview ctor

[wxWidgets.git] / wxPython / src / _notebook.i

diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i
index 4edc1f517b8f9405d004fd84676ebf51113a7373..1d9565a5553994a85153574cea6ab36bee70ad6f 100644 (file)
--- a/wxPython/src/_notebook.i
+++ b/wxPython/src/_notebook.i
@@ -154,6 +154,7 @@ enum {
     wxNB_RIGHT,
     wxNB_BOTTOM,
     wxNB_MULTILINE,
     wxNB_RIGHT,
     wxNB_BOTTOM,
     wxNB_MULTILINE,

+    wxNB_NOPAGETHEME,

 
     // hittest flags
     wxNB_HITTEST_NOWHERE = 1,   // not on tab
 
     // hittest flags
     wxNB_HITTEST_NOWHERE = 1,   // not on tab


@@ -213,6 +214,10 @@ wx.NB_HITTEST flags.", "");
     // implement some base class functions
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
 
     // implement some base class functions
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
 

+    // On platforms that support it, get the theme page background colour,
+    // else invalid colour
+    wxColour GetThemeBackgroundColour() const;
+    

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };


@@ -246,7 +251,7 @@ class NotebookPage(wx.Panel):
     """
     There is an old (and apparently unsolvable) bug when placing a
     window with a nonstandard background colour in a wx.Notebook on
     """
     There is an old (and apparently unsolvable) bug when placing a
     window with a nonstandard background colour in a wx.Notebook on

-    wxGTK, as the notbooks's background colour would always be used
+    wxGTK1, as the notbooks's background colour would always be used

     when the window is refreshed.  The solution is to place a panel in
     the notbook and the coloured window on the panel, sized to cover
     the panel.  This simple class does that for you, just put an
     when the window is refreshed.  The solution is to place a panel in
     the notbook and the coloured window on the panel, sized to cover
     the panel.  This simple class does that for you, just put an


@@ -383,7 +388,10 @@ public:
 
 
     // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style
 
 
     // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style

-    bool IsVertical() const { return HasFlag(wxCHB_BOTTOM | wxCHB_TOP); }
+    bool IsVertical() const;
+
+    // returns the choice control
+    wxChoice* GetChoiceCtrl() const;

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


@@ -408,7 +416,7 @@ public:
 %newgroup;
 
 // WXWIN_COMPATIBILITY_2_4
 %newgroup;
 
 // WXWIN_COMPATIBILITY_2_4

-
+#if 0

 class wxBookCtrlSizer: public wxSizer
 {
 public:
 class wxBookCtrlSizer: public wxSizer
 {
 public:


@@ -433,9 +441,8 @@ public:
     wxNotebook *GetNotebook();
 };
 
     wxNotebook *GetNotebook();
 };
 

-
-%pythoncode { NotebookSizer = wx._deprecated(NotebookSizer, "NotebookSizer is no longer needed.") }
-%pythoncode { BookCtrlSizer = wx._deprecated(BookCtrlSizer, "BookCtrlSizer is no longer needed.") }
-
+%pythoncode { NotebookSizer.__init__ = wx._deprecated(NotebookSizer.__init__, "NotebookSizer is no longer needed.") }
+%pythoncode { BookCtrlSizer.__init__ = wx._deprecated(BookCtrlSizer.__init__, "BookCtrlSizer is no longer needed.") }
+#endif

 
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------