fixed recent modeless dialog breakage caused by removing wxDIALOG_MODAL (wxModelessWi...

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 986375a02b6c458c1e8caba6aa817cbc388695ec..3812ea2ed83d6524e649151e1401c6c35743f3ee 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CLNTDATAH__
 #define _WX_CLNTDATAH__
 
 #ifndef _WX_CLNTDATAH__
 #define _WX_CLNTDATAH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "clntdata.h"
 #endif
 
     #pragma interface "clntdata.h"
 #endif
 


@@ -29,14 +29,14 @@ enum wxClientDataType
     wxClientData_Void     // client data is untyped and we don't own it
 };
 
     wxClientData_Void     // client data is untyped and we don't own it
 };
 

-class WXDLLEXPORT_BASE wxClientData
+class WXDLLEXPORT wxClientData

 {
 public:
     wxClientData() { }
     virtual ~wxClientData() { }
 };
 
 {
 public:
     wxClientData() { }
     virtual ~wxClientData() { }
 };
 

-class WXDLLEXPORT_BASE wxStringClientData : public wxClientData
+class WXDLLEXPORT wxStringClientData : public wxClientData

 {
 public:
     wxStringClientData() : m_data() { }
 {
 public:
     wxStringClientData() : m_data() { }


@@ -57,7 +57,7 @@ private:
 // NOTE:  This functionality is currently duplicated in wxEvtHandler in order
 //        to avoid having more than one vtable in that class hierarchy.
 
 // NOTE:  This functionality is currently duplicated in wxEvtHandler in order
 //        to avoid having more than one vtable in that class hierarchy.
 

-class WXDLLEXPORT_BASE wxClientDataContainer
+class WXDLLEXPORT wxClientDataContainer

 {
 public:
     wxClientDataContainer();
 {
 public:
     wxClientDataContainer();