Deallocate wxThreadSpecificInfo when wxThread ends.

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

diff --git a/include/wx/paper.h b/include/wx/paper.h
index 6e5a8983c8bf1440411d6b884eb1484fbc9016ce..d50d5498044dfca43b779128117eff56bcbfcb8f 100644 (file)
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        paper.h
+// Name:        wx/paper.h

 // Purpose:     Paper database types and classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Purpose:     Paper database types and classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +11,6 @@
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "paper.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/event.h"
 #include "wx/cmndata.h"
 #include "wx/defs.h"
 #include "wx/event.h"
 #include "wx/cmndata.h"


@@ -34,7 +29,7 @@
 #define WXADDPAPER(paperId, platformId, name, w, h) AddPaperType(paperId, 0, name, w, h)
 #endif
 
 #define WXADDPAPER(paperId, platformId, name, w, h) AddPaperType(paperId, 0, name, w, h)
 #endif
 

-class WXDLLEXPORT wxPrintPaperType: public wxObject
+class WXDLLIMPEXP_CORE wxPrintPaperType: public wxObject

 {
 public:
     wxPrintPaperType();
 {
 public:
     wxPrintPaperType();


@@ -72,9 +67,9 @@ private:
 
 WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
 
 
 WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
 

-class WXDLLEXPORT wxPrintPaperTypeList;
+class WXDLLIMPEXP_FWD_CORE wxPrintPaperTypeList;

 
 

-class WXDLLEXPORT wxPrintPaperDatabase
+class WXDLLIMPEXP_CORE wxPrintPaperDatabase

 {
 public:
     wxPrintPaperDatabase();
 {
 public:
     wxPrintPaperDatabase();


@@ -119,7 +114,7 @@ private:
     // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 
     // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 

-WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
+extern WXDLLIMPEXP_DATA_CORE(wxPrintPaperDatabase*) wxThePrintPaperDatabase;

 
 
 #endif
 
 
 #endif