support retina display

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

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 454cf9f01e92d94863ca2b698053ac523da7a54c..5be3df0b5b16465d6e72a88bfcd50d9c0f0632b5 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        notebook.h
+// Name:        wx/gtk1/notebook.h

 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:


@@ -11,15 +11,11 @@
 #ifndef __GTKNOTEBOOKH__
 #define __GTKNOTEBOOKH__
 
 #ifndef __GTKNOTEBOOKH__
 #define __GTKNOTEBOOKH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 //-----------------------------------------------------------------------------
 // internal class
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // internal class
 //-----------------------------------------------------------------------------
 

-class wxGtkNotebookPage;
+class WXDLLIMPEXP_FWD_CORE wxGtkNotebookPage;

 
 #include "wx/list.h"
 WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
 
 #include "wx/list.h"
 WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);


@@ -28,7 +24,7 @@ WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
 // wxNotebook
 //-----------------------------------------------------------------------------
 
 // wxNotebook
 //-----------------------------------------------------------------------------
 

-class wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase

 {
 public:
       // default for dynamic class
 {
 public:
       // default for dynamic class


@@ -39,14 +35,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();
 


@@ -54,11 +50,14 @@ public:
   // ---------
 
     // set the currently selected page, return the index of the previously
   // ---------
 
     // set the currently selected page, return the index of the previously

-    // selected one (or -1 on error)
+    // selected one (or wxNOT_FOUND on error)

     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events

-  int SetSelection(size_t nPage);
+    int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }

     // get the currently selected page
     // get the currently selected page

-  int GetSelection() const;
+    int GetSelection() const;
+
+    // changes selected page without sending events
+    int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }

 
     // set/get the title of a page
   bool SetPageText(size_t nPage, const wxString& strText);
 
     // set/get the title of a page
   bool SetPageText(size_t nPage, const wxString& strText);


@@ -83,14 +82,14 @@ public:
     // remove all pages
   bool DeleteAllPages();
 
     // remove all pages
   bool DeleteAllPages();
 

-    // adds a new page to the notebook (it will be deleted ny the notebook,
+    // adds a new page to the notebook (it will be deleted by 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( size_t position,
                      wxNotebookPage *win,
                      const wxString& strText,
     // don't delete it yourself). If bSelect, this page becomes active.
     // the same as AddPage(), but adds it at the specified position
     bool InsertPage( size_t position,
                      wxNotebookPage *win,
                      const wxString& strText,

-                     bool bSelect = FALSE,
-                     int imageId = -1 );
+                     bool bSelect = false,
+                     int imageId = NO_IMAGE );

 
     // handler for tab navigation
     // --------------------------
 
     // handler for tab navigation
     // --------------------------


@@ -99,7 +98,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

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


@@ -127,13 +126,18 @@ 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;
 
     bool m_inSwitchPage;
 

+    // flag set to true when the switch-page signal has been programmatically generated
+    bool m_skipNextPageChangeEvent;
+

 protected:
     // remove one page from the notebook but do not destroy it
     virtual wxNotebookPage *DoRemovePage(size_t nPage);
 
 protected:
     // remove one page from the notebook but do not destroy it
     virtual wxNotebookPage *DoRemovePage(size_t nPage);
 

+    int DoSetSelection(size_t nPage, int flags = 0);
+

 private:
     // the padding set by SetPadding()
     int m_padding;
 private:
     // the padding set by SetPadding()
     int m_padding;