X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee4f8c2af9c6c5458e488db10aef7d00a89ace25..2fff5f0811df871262c511b360f12d6808c107db:/include/wx/msw/tabctrl.h

diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h
index c7589bedee..cd975821e2 100644
--- a/include/wx/msw/tabctrl.h
+++ b/include/wx/msw/tabctrl.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TABCTRLH__
-#define __TABCTRLH__
+#ifndef _WX_TABCTRL_H_
+#define _WX_TABCTRL_H_
 
 #ifdef __GNUG__
 #pragma interface "tabctrl.h"
@@ -51,6 +51,9 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
     // Get the selection
     int GetSelection() const;
 
+    // Get the tab with the current keyboard focus
+    int GetCurFocus() const;
+
     // Get the associated image list
     wxImageList* GetImageList() const;
 
@@ -95,8 +98,8 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
 
 // Operations
 
-    bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                const long style = 0, const wxString& name = "tabCtrl");
+    bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+                long style = 0, const wxString& name = "tabCtrl");
 
     // Delete all items
     bool DeleteAllItems();
@@ -119,8 +122,9 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
     void OnKillFocus(wxFocusEvent& event) { Default() ; }
 
     void Command(wxCommandEvent& event);
-    bool MSWCommand(const WXUINT param, const WXWORD id);
-    bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+    virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -136,7 +140,7 @@ class WXDLLEXPORT wxTabEvent: public wxCommandEvent
   DECLARE_DYNAMIC_CLASS(wxTabEvent)
 
  public:
-  wxTabEvent(WXTYPE commandType = 0, int id = 0);
+  wxTabEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 };
 
 typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
@@ -147,4 +151,4 @@ typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
   id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
 
 #endif
-    // __TABCTRLH__
+    // _WX_TABCTRL_H_