simplify toolbar and statusbar create/set code

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

diff --git a/include/wx/paper.h b/include/wx/paper.h
index 087eb6d5cee0a1043b5b11c762ea5aabb477c391..2d2bf3f7b5e6cd68dc2c7be908ec1f80bd84a991 100644 (file)
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -6,16 +6,12 @@
 // 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_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"


@@ -72,7 +68,7 @@ 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 WXDLLEXPORT wxPrintPaperDatabase
 {


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

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

 
 
 #endif
 
 
 #endif