Fixed bug #1163384. Moved the code that handles activating the cell

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index c08588371470347ddea081832557a67317f300f2..7261a747a553224ff308c01ecc18f0029da6430d 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -30,23 +30,33 @@
 class WXDLLEXPORT wxNotebookPageInfo : public wxObject
 {
 public :
-    wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; }
+    wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; }
     virtual ~wxNotebookPageInfo() { }
 
-    void Create( wxNotebookPage *page , const wxString &text , bool selected , int imageId )
-    { m_page = page ; m_text = text ; m_selected = selected ; m_imageId = imageId ; }
-    wxNotebookPage* GetPage() const { return m_page ; }
-    wxString GetText() const { return m_text ; }
-    bool GetSelected() const { return m_selected ; }
+    void Create(wxNotebookPage *page,
+                const wxString& text,
+                bool selected,
+                int imageId)
+    {
+        m_page = page;
+        m_text = text;
+        m_selected = selected;
+        m_imageId = imageId;
+    }
+
+    wxNotebookPage* GetPage() const { return m_page; }
+    wxString GetText() const { return m_text; }
+    bool GetSelected() const { return m_selected; }
     int GetImageId() const { return m_imageId; }
-private :
-    wxNotebookPage *m_page ;
-    wxString m_text ;
-    bool m_selected ;
-    int m_imageId ;
 
-    DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo) ;
-} ;
+private:
+    wxNotebookPage *m_page;
+    wxString m_text;
+    bool m_selected;
+    int m_imageId;
+
+    DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo)
+};
 
 
 WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
@@ -64,14 +74,14 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxNOTEBOOK_NAME);
+             const wxString& name = wxNotebookNameStr);
     // Create() function
   bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
-              const wxString& name = wxNOTEBOOK_NAME);
+              const wxString& name = wxNotebookNameStr);
   virtual ~wxNotebook();
 
   // accessors
@@ -125,8 +135,8 @@ public:
                   bool bSelect = false,
                   int imageId = -1);
 
-  void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; }
-  const wxNotebookPageInfoList& GetPageInfos() const ;
+  void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ); }
+  const wxNotebookPageInfoList& GetPageInfos() const;
 
     // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
     // style.
@@ -157,22 +167,25 @@ public:
   virtual bool DoPhase(int nPhase);
 #endif // wxUSE_CONSTRAINTS
 
+  // Attempts to get colour for UX theme page background
+  wxColour GetThemeBackgroundColour() const;
 
   // implementation only
   // -------------------
 
 #if wxUSE_UXTHEME
-  // handler for child pages erase background event
-  void DoEraseBackground(wxEraseEvent& event);
+  virtual bool SetBackgroundColour(const wxColour& colour)
+  {
+      if ( !wxNotebookBase::SetBackgroundColour(colour) )
+          return false;
 
-  // real implementation of the above method
-  void DoEraseBackground(wxWindow *win, WXHDC hDC);
+      UpdateBgBrush();
 
-  // get the brush to be used for painting the background for the controls
-  // which need it in their MSWControlColor()
-  //
-  // the brush will be adjusted for use with the given window on this DC
-  WXHBRUSH GetThemeBackgroundBrush(WXHDC hDC, wxWindow *win) const;
+      return true;
+  }
+
+  virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindow *win);
+  virtual wxColour MSWGetBgColourForChild(wxWindow *win);
 #endif // wxUSE_UXTHEME
 
 protected:
@@ -189,8 +202,19 @@ protected:
   void AdjustPageSize(wxNotebookPage *page);
 
 #if wxUSE_UXTHEME
+  // this is a slightly ugly function which gets the bitmap of notebook
+  // background and either returns the colour under the specified window in it
+  // or creates a brush from it
+  //
+  // so if win == NULL, a brush is created and returned
+  //       win != NULL, returns COLORREF of the pixel under its top left corner
+  WXHANDLE QueryBgBitmap(wxWindow *win = NULL);
+
   // creates the brush to be used for drawing the tab control background
   void UpdateBgBrush();
+
+  // paint themed children background here
+  virtual bool MSWPrintChild(wxWindow *win, WXWPARAM wParam, WXLPARAM lParam);
 #endif // wxUSE_UXTHEME
 
   // the current selection (-1 if none)