Fixing font utilities

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

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index f0040b4266c63d171509c9c8ce1f3c1c2c856a69..3e29d78106a866f7a4a3a9506ee626dc56295fdd 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -13,7 +13,7 @@
 #define _WX_UNIV_NOTEBOOK_H_
 
 #ifdef __GNUG__
 #define _WX_UNIV_NOTEBOOK_H_
 
 #ifdef __GNUG__

-    #pragma interface "notebook.h"
+    #pragma interface "univnotebook.h"

 #endif
 
 class WXDLLEXPORT wxSpinButton;
 #endif
 
 class WXDLLEXPORT wxSpinButton;


@@ -155,7 +155,7 @@ protected:
     void PositionSpinBtn();
 
     // refresh the given tab only
     void PositionSpinBtn();
 
     // refresh the given tab only

-    void RefreshTab(int page);
+    void RefreshTab(int page, bool forceSelected = FALSE);

 
     // refresh all tabs
     void RefreshAllTabs();
 
     // refresh all tabs
     void RefreshAllTabs();


@@ -259,17 +259,17 @@ class WXDLLEXPORT wxStdNotebookInputHandler : public wxStdInputHandler
 public:
     wxStdNotebookInputHandler(wxInputHandler *inphand);
 
 public:
     wxStdNotebookInputHandler(wxInputHandler *inphand);
 

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
                              const wxMouseEvent& event);

-    virtual bool HandleMouseMove(wxControl *control, const wxMouseEvent& event);
-    virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event);
-    virtual bool HandleActivation(wxControl *control, bool activated);
+    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
+    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);

 
 protected:
 
 protected:

-    void HandleFocusChange(wxControl *control);
+    void HandleFocusChange(wxInputConsumer *consumer);

 };
 
 #endif // _WX_UNIV_NOTEBOOK_H_
 };
 
 #endif // _WX_UNIV_NOTEBOOK_H_