X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da87a1ca42a81c7b7b69cb013eb52d09cd5c1b70..7b30ac82dd01b5ca4fd1db2f2889b7714ad1577c:/include/wx/msw/tabctrl.h?ds=sidebyside diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index 6b9dd252b6..c193c9d44c 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" @@ -18,7 +18,7 @@ class wxImageList; -// WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; +// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; /* * Flags returned by HitTest @@ -98,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(); @@ -113,17 +113,9 @@ class WXDLLEXPORT wxTabCtrl: public wxControl // Insert an item bool InsertItem(int item, const wxString& text, int imageId = -1, void* data = NULL); -// Implementation + // Implementation - // Call default behaviour - void OnPaint(wxPaintEvent& event) { Default() ; } - void OnSize(wxSizeEvent& event) { Default() ; } - void OnMouseEvent(wxMouseEvent& event) { Default() ; } - 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 MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); // Responds to colour changes void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -150,4 +142,4 @@ typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&); id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL }, #endif - // __TABCTRLH__ + // _WX_TABCTRL_H_