From cca784632f8ee59b6f0fcae5da50d287da55bb6f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 30 Jan 2003 01:48:11 +0000 Subject: [PATCH] Fix for export warning when compiling a DLL. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dde.h | 6 +++--- include/wx/msw/gdiimage.h | 2 +- include/wx/msw/listctrl.h | 3 +++ include/wx/msw/taskbar.h | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/wx/dde.h b/include/wx/dde.h index 15d70578b4..a1fc0644f0 100644 --- a/include/wx/dde.h +++ b/include/wx/dde.h @@ -7,9 +7,9 @@ class wxDDEClient; class wxDDEServer; class wxDDEConnection; -WX_DECLARE_LIST(wxDDEClient, wxDDEClientList); -WX_DECLARE_LIST(wxDDEServer, wxDDEServerList); -WX_DECLARE_LIST(wxDDEConnection, wxDDEConnectionList); +WX_DECLARE_EXPORTED_LIST(wxDDEClient, wxDDEClientList); +WX_DECLARE_EXPORTED_LIST(wxDDEServer, wxDDEServerList); +WX_DECLARE_EXPORTED_LIST(wxDDEConnection, wxDDEConnectionList); #if defined(__WXMSW__) diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h index 522e5477df..d36042772f 100644 --- a/include/wx/msw/gdiimage.h +++ b/include/wx/msw/gdiimage.h @@ -28,7 +28,7 @@ class WXDLLEXPORT wxGDIImageRefData; class WXDLLEXPORT wxGDIImageHandler; class WXDLLEXPORT wxGDIImage; -WX_DECLARE_LIST(wxGDIImageHandler, wxGDIImageHandlerList); +WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList); // ---------------------------------------------------------------------------- // wxGDIImageRefData: common data fields for all derived classes diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h index 5de83175f9..eaf82c0cd6 100644 --- a/include/wx/msw/listctrl.h +++ b/include/wx/msw/listctrl.h @@ -370,6 +370,9 @@ protected: long m_baseStyle; // Basic Windows style flags, for recreation purposes int m_colCount; // Windows doesn't have GetColumnCount so must // keep track of inserted/deleted columns + long m_count; // Keep track of item count to save calls to + // ListView_GetItemCount + bool m_ignoreChangeMessages; // TRUE if we have any internal data (user data & attributes) bool m_AnyInternalData; diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h index b6fccfa2c4..47fb0e8fae 100644 --- a/include/wx/msw/taskbar.h +++ b/include/wx/msw/taskbar.h @@ -23,7 +23,7 @@ class wxTaskBarIcon; -WX_DECLARE_LIST(wxTaskBarIcon, wxTaskBarIconList); +WX_DECLARE_EXPORTED_LIST(wxTaskBarIcon, wxTaskBarIconList); class WXDLLEXPORT wxTaskBarIcon: public wxEvtHandler { DECLARE_DYNAMIC_CLASS(wxTaskBarIcon) -- 2.45.2