1. wxStaticBitmap now uses mask even for bitmaps (and not only icons)

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index d8c772d7a0798068bd3f7e738af4126a682274dc..45039a0bd775da6bbed4f00c5aeb8cc0f0ece7d1 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -38,26 +38,24 @@ class wxNotebookPage;
 class wxNotebook : public wxControl
 {
 public:
 class wxNotebook : public wxControl
 {
 public:

-  // ctors
-  // -----
-    // default for dynamic class
-  wxNotebook();
-    // the same arguments as for wxControl (@@@ any special styles?)
-  wxNotebook(wxWindow *parent,
+      // default for dynamic class
+    wxNotebook();
+      // the same arguments as for wxControl
+    wxNotebook(wxWindow *parent,

              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxString& name = "notebook");
              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxString& name = "notebook");

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

               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = "notebook");
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = "notebook");

-    // dtor
-  ~wxNotebook();
+      // dtor
+    ~wxNotebook();

 
   // accessors
   // ---------
 
   // accessors
   // ---------


@@ -128,32 +126,33 @@ public:
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 

-  void OnNavigationKey(wxNavigationKeyEvent& event);
+    // handler for tab navigation
+    // --------------------------
+    void OnNavigationKey(wxNavigationKeyEvent& event);

 
 

-    // overridden from wxWindow to make tabbing work  
-  void SetFocus();
+    // implementation
+    // --------------

 
 

-  // implementation
+    void SetConstraintSizes(bool recurse);
+    bool DoPhase(int phase);
+    void ApplyWidgetStyle();

 
 

-  void SetConstraintSizes(bool recurse);
-  bool DoPhase(int phase);
-  void ApplyWidgetStyle();
+    // report if window belongs to notebook  
+    bool IsOwnGtkWindow( GdkWindow *window );

 
 

-  // report if window belongs to notebook  
-  bool IsOwnGtkWindow( GdkWindow *window );
+    // common part of all ctors
+    void Init();

 
 

-  // common part of all ctors
-  void Init();
+    // helper function
+    wxNotebookPage* GetNotebookPage(int page) const;

 
 

-  // helper function
-  wxNotebookPage* GetNotebookPage(int page) const;
+    wxImageList*    m_imageList;
+    wxList          m_pages;
+    int             m_lastSelection;  /* hack */

 
 

-  wxImageList*    m_imageList;
-  wxList          m_pages;
-  int             m_lastSelection;  /* hack */
-
-  DECLARE_DYNAMIC_CLASS(wxNotebook)
-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS(wxNotebook)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif