projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some styling bugs, optimized resize for large files
[wxWidgets.git]
/
include
/
wx
/
msw
/
tabctrl.h
diff --git
a/include/wx/msw/tabctrl.h
b/include/wx/msw/tabctrl.h
index 4571967de852223dcd81c759995872b421ea6733..ea7afd2fd3b51c72973f78a2b1f4d599f9870e3d 100644
(file)
--- a/
include/wx/msw/tabctrl.h
+++ b/
include/wx/msw/tabctrl.h
@@
-6,19
+6,15
@@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_TABCTRL_H_
#define _WX_TABCTRL_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_TABCTRL_H_
#define _WX_TABCTRL_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "tabctrl.h"
-#endif
-
-class wxImageList;
+class WXDLLIMPEXP_CORE wxImageList;
-//
WXDLLEXPORT_DATA(extern
const wxChar*) wxToolBarNameStr;
+//
extern WXDLLEXPORT_DATA(
const wxChar*) wxToolBarNameStr;
/*
* Flags returned by HitTest
/*
* Flags returned by HitTest
@@
-156,9
+152,9
@@
private:
typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
#define EVT_TAB_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGED, \
typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
#define EVT_TAB_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGED, \
- id,
-1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn
, NULL),
+ id,
wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxTabEventFunction, & fn )
, NULL),
#define EVT_TAB_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGING, \
#define EVT_TAB_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGING, \
- id,
-1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn
, NULL),
+ id,
wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxTabEventFunction, & fn )
, NULL),
#endif
// _WX_TABCTRL_H_
#endif
// _WX_TABCTRL_H_