Applied patch [ 1181975 ] [wxMSW] Removes all flicker from wxNotebook

[wxWidgets.git] / include / wx / mac / carbon / notebook.h

diff --git a/include/wx/mac/carbon/notebook.h b/include/wx/mac/carbon/notebook.h
index de84c12a65e56d94aec7b46a3a81cb5dda474626..8f88862122027656adc1a45f16bac89a33427ac8 100644 (file)
--- a/include/wx/mac/carbon/notebook.h
+++ b/include/wx/mac/carbon/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NOTEBOOK_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NOTEBOOK_H_


@@ -44,18 +44,18 @@ public:
   wxNotebook();
     // the same arguments as for wxControl (@@@ any special styles?)
   wxNotebook(wxWindow *parent,
   wxNotebook();
     // the same arguments as for wxControl (@@@ any special styles?)
   wxNotebook(wxWindow *parent,

-             wxWindowID id, 
+             wxWindowID id,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,

-             const wxString& name = wxT("notebook"));
+             const wxString& name = wxNotebookNameStr);

     // Create() function
   bool Create(wxWindow *parent,
     // Create() function
   bool Create(wxWindow *parent,

-              wxWindowID id, 
+              wxWindowID id,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,

-              const wxString& name = wxT("notebook"));
+              const wxString& name = wxNotebookNameStr);

     // dtor
   ~wxNotebook();
 
     // dtor
   ~wxNotebook();
 


@@ -83,7 +83,7 @@ public:
   virtual void SetPadding(const wxSize& padding);
     // sets the size of the tabs (assumes all tabs are the same size)
   virtual void SetTabSize(const wxSize& sz);
   virtual void SetPadding(const wxSize& padding);
     // sets the size of the tabs (assumes all tabs are the same size)
   virtual void SetTabSize(const wxSize& sz);

-   
+

     // calculate size for wxNotebookSizer
   wxSize CalcSizeFromPage(const wxSize& sizePage) const;
   wxRect GetPageRect() const ;
     // calculate size for wxNotebookSizer
   wxSize CalcSizeFromPage(const wxSize& sizePage) const;
   wxRect GetPageRect() const ;


@@ -92,7 +92,7 @@ public:
   int GetPageCount() const;
 
     // cycle thru the tabs
   int GetPageCount() const;
 
     // cycle thru the tabs

-  void AdvanceSelection(bool bForward = TRUE);
+  void AdvanceSelection(bool bForward = true);

 
 
     // currently it's always 1 because wxGTK doesn't support multi-row
 
 
     // currently it's always 1 because wxGTK doesn't support multi-row


@@ -107,7 +107,7 @@ public:
   bool InsertPage(size_t nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
   bool InsertPage(size_t nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,

-                  bool bSelect = FALSE,
+                  bool bSelect = false,

                   int imageId = -1);
 /*
     // get the panel which represents the given page
                   int imageId = -1);
 /*
     // get the panel which represents the given page


@@ -124,7 +124,7 @@ public:
     // --------------
 
 #if wxUSE_CONSTRAINTS
     // --------------
 
 #if wxUSE_CONSTRAINTS

-  virtual void SetConstraintSizes(bool recurse = TRUE);
+  virtual void SetConstraintSizes(bool recurse = true);

   virtual bool DoPhase(int nPhase);
 
 #endif
   virtual bool DoPhase(int nPhase);
 
 #endif


@@ -133,7 +133,6 @@ public:
   // -------------------
   virtual void Command(wxCommandEvent& event);
 protected:
   // -------------------
   virtual void Command(wxCommandEvent& event);
 protected:

-  virtual wxSize DoGetBestSize() const ;

   virtual wxNotebookPage *DoRemovePage(size_t page) ;
   virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
   // common part of all ctors
   virtual wxNotebookPage *DoRemovePage(size_t page) ;
   virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
   // common part of all ctors