added #define wxToolBar wxToolBarGTK for wxGTK

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

diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h
index c7589bedee6f9fcfb45467fa0ff7d9990de84678..b5c076eb7f46ce0daa65babb93319c6e02d26d1b 100644 (file)
--- a/include/wx/msw/tabctrl.h
+++ b/include/wx/msw/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,8 @@ 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);
+    bool MSWCommand(WXUINT param, WXWORD id);
+    bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -136,7 +139,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&);