Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

[wxWidgets.git] / include / wx / gtk / notebook.h

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 5209ce6f84fd8e2585ff52932d01d391b9a6deb6..43473dc10048a2d9a97b80fb8af29798a55ead22 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -39,14 +39,14 @@ public:
              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,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
       // Create() function
     bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,

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

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


@@ -76,26 +76,30 @@ public:
     // sets the size of the tabs (assumes all tabs are the same size)
   void SetTabSize(const wxSize& sz);
 
     // sets the size of the tabs (assumes all tabs are the same size)
   void SetTabSize(const wxSize& sz);
 

+  virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
+

   // operations
   // ----------
   // operations
   // ----------

-    // remove one page from the notebook
-  bool DeletePage(size_t nPage);

     // remove all pages
   bool DeleteAllPages();
 
     // adds a new page to the notebook (it will be deleted ny the notebook,
     // don't delete it yourself). If bSelect, this page becomes active.
     // the same as AddPage(), but adds it at the specified position
     // remove all pages
   bool DeleteAllPages();
 
     // adds a new page to the notebook (it will be deleted ny the notebook,
     // don't delete it yourself). If bSelect, this page becomes active.
     // the same as AddPage(), but adds it at the specified position

-    bool InsertPage( int position,
+    bool InsertPage( size_t position,

                      wxNotebookPage *win,
                      const wxString& strText,
                      wxNotebookPage *win,
                      const wxString& strText,

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

                      int imageId = -1 );
 
     // handler for tab navigation
     // --------------------------
     void OnNavigationKey(wxNavigationKeyEvent& event);
 
                      int imageId = -1 );
 
     // handler for tab navigation
     // --------------------------
     void OnNavigationKey(wxNavigationKeyEvent& event);
 

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

     // implementation
     // --------------
 
     // implementation
     // --------------
 


@@ -104,7 +108,8 @@ public:
     bool DoPhase(int phase);
 #endif
 
     bool DoPhase(int phase);
 #endif
 

-    void ApplyWidgetStyle();
+    // set all page's attributes
+    void DoApplyWidgetStyle(GtkRcStyle *style);

 
     // report if window belongs to notebook
     bool IsOwnGtkWindow( GdkWindow *window );
 
     // report if window belongs to notebook
     bool IsOwnGtkWindow( GdkWindow *window );


@@ -122,7 +127,7 @@ public:
     // selection internally instead of querying the notebook for it
     int m_selection;
 
     // selection internally instead of querying the notebook for it
     int m_selection;
 

-    // flag set to TRUE while we're inside "switch_page" callback
+    // flag set to true while we're inside "switch_page" callback

     bool m_inSwitchPage;
 
 protected:
     bool m_inSwitchPage;
 
 protected: