use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is...

[wxWidgets.git] / include / wx / display.h

diff --git a/include/wx/display.h b/include/wx/display.h
index d91abbaf83e8101c6aa985f41eef30bdc4530b02..7923e9c68782a75f343bf645329f6f3ace6a1efe 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -22,7 +22,7 @@
     WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes);
 
     // default, uninitialized, video mode object
     WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes);
 
     // default, uninitialized, video mode object

-    extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode;
+    extern WXDLLIMPEXP_DATA_CORE(const wxVideoMode) wxDefaultVideoMode;

 #endif // wxUSE_DISPLAY
 
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 #endif // wxUSE_DISPLAY
 
 class WXDLLIMPEXP_FWD_CORE wxWindow;


@@ -37,7 +37,7 @@ class WXDLLIMPEXP_FWD_CORE wxDisplayImpl;
 // wxDisplay: represents a display/monitor attached to the system
 // ----------------------------------------------------------------------------
 
 // wxDisplay: represents a display/monitor attached to the system
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDisplay
+class WXDLLIMPEXP_CORE wxDisplay

 {
 public:
     // initialize the object containing all information about the given
 {
 public:
     // initialize the object containing all information about the given


@@ -122,7 +122,7 @@ private:
     wxDisplayImpl *m_impl;
 
 
     wxDisplayImpl *m_impl;
 
 

-    DECLARE_NO_COPY_CLASS(wxDisplay)
+    wxDECLARE_NO_COPY_CLASS(wxDisplay);

 };
 
 #endif // _WX_DISPLAY_H_BASE_
 };
 
 #endif // _WX_DISPLAY_H_BASE_