cleaning up problems after string changes

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

diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h
index ef3e50fa9c356fcf890efe4e3038cadbf647be81..4e348af1d25e9ffe5c08b78ea37da6197bd4dfa7 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_
 

-#ifdef __GNUG__
-#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


@@ -44,7 +40,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
     {
         Create(parent, id, pos, size, style, name);
     }
     {
         Create(parent, id, pos, size, style, name);
     }

-    ~wxTabCtrl();
+    virtual ~wxTabCtrl();

 
 // Accessors
 
 
 // Accessors
 


@@ -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_