activating DrawRectangle optimization

[wxWidgets.git] / include / wx / generic / tabg.h

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index b95297e4f4b5843a1004bfd34d77747fb640f39e..a5975e5f8a84f4de095420dfb9006df85f5d39fc 100644 (file)
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tabg.h
+// Name:        wx/generic/tabg.h

 // Purpose:     Generic tabbed dialogs; used by wxMotif's wxNotebook
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Generic tabbed dialogs; used by wxMotif's wxNotebook
 // Author:      Julian Smart
 // Modified by:


@@ -31,7 +31,7 @@ class WXDLLIMPEXP_CORE wxTabControl: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxTabControl)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxTabControl)
 public:

-    wxTabControl(wxTabView *v = (wxTabView *) NULL);
+    wxTabControl(wxTabView *v = NULL);

     virtual ~wxTabControl(void);
 
     virtual void OnDraw(wxDC& dc, bool lastInRow);
     virtual ~wxTabControl(void);
 
     virtual void OnDraw(wxDC& dc, bool lastInRow);


@@ -108,7 +108,7 @@ public:
   inline wxWindow* GetWindow(void) const { return m_window; }
 
   // Automatically positions tabs
   inline wxWindow* GetWindow(void) const { return m_window; }
 
   // Automatically positions tabs

-  wxTabControl *AddTab(int id, const wxString& label, wxTabControl *existingTab = (wxTabControl *) NULL);
+  wxTabControl *AddTab(int id, const wxString& label, wxTabControl *existingTab = NULL);

 
   // Remove the tab without deleting the window
   bool RemoveTab(int id);
 
   // Remove the tab without deleting the window
   bool RemoveTab(int id);


@@ -130,7 +130,7 @@ public:
   // Called when a tab is activated
   virtual void OnTabActivate(int activateId, int deactivateId);
   // Allows vetoing
   // Called when a tab is activated
   virtual void OnTabActivate(int activateId, int deactivateId);
   // Allows vetoing

-  virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; };
+  virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; }

 
   // Allows use of application-supplied wxTabControl classes.
   virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); }
 
   // Allows use of application-supplied wxTabControl classes.
   virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); }