fix MSVC /Wp64 warnings

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

diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h
index 4a11d95c357e1c6fd0480dd2751feeda71b51be5..e0fbd24baaa866ab958a9c30f43bdca9777d90e8 100644 (file)
--- a/include/wx/msw/tabctrl.h
+++ b/include/wx/msw/tabctrl.h
@@ -6,19 +6,13 @@
 // 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;
-
-// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+class WXDLLIMPEXP_FWD_CORE wxImageList;

 
 /*
  * Flags returned by HitTest
 
 /*
  * Flags returned by HitTest


@@ -29,7 +23,7 @@ class wxImageList;
 #define wxTAB_HITTEST_ONLABEL           4
 #define wxTAB_HITTEST_ONITEM            6
 
 #define wxTAB_HITTEST_ONLABEL           4
 #define wxTAB_HITTEST_ONITEM            6
 

-class WXDLLEXPORT wxTabCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxTabCtrl: public wxControl

 {
   DECLARE_DYNAMIC_CLASS(wxTabCtrl)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxTabCtrl)
  public:


@@ -44,7 +38,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
 


@@ -127,7 +121,7 @@ DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxTabCtrl)
 };
 
     DECLARE_NO_COPY_CLASS(wxTabCtrl)
 };
 

-class WXDLLEXPORT wxTabEvent : public wxNotifyEvent
+class WXDLLIMPEXP_CORE wxTabEvent : public wxNotifyEvent

 {
 public:
     wxTabEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
 {
 public:
     wxTabEvent(wxEventType commandType = wxEVT_NULL, int id = 0,


@@ -150,15 +144,15 @@ private:
     int m_nSel,     // currently selected page
         m_nOldSel;  // previously selected page
 
     int m_nSel,     // currently selected page
         m_nOldSel;  // previously selected page
 

-    DECLARE_DYNAMIC_CLASS(wxTabEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTabEvent)

 };
 
 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_