Added wxPoem sample; fixed some Dialog Editor problems; wxStaticBitmap and wxBitmapButton

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

diff --git a/include/wx/postscrp.h b/include/wx/postscrp.h
index 7bfa8a8312c46127eb7e1b99ef6b94470836b6cc..f0c1e5e0dc978576ee2783ff91ac6d9cf51a0a90 100644 (file)
--- a/include/wx/postscrp.h
+++ b/include/wx/postscrp.h
@@ -9,12 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __WXGTK__
-
-#include "wx/gtk/dcps.h"
-
-#else
-

 #ifndef _WX_POSTSCRPH__
 #define _WX_POSTSCRPH__
 
 #ifndef _WX_POSTSCRPH__
 #define _WX_POSTSCRPH__
 


@@ -49,6 +43,14 @@ public:
 #  endif
 #endif
 
 #  endif
 #endif
 

+#ifdef __WXGTK__
+
+// wxGTK has its own wxPostscriptDC
+
+#include "wx/gtk/dcps.h"
+
+#else
+

 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
   DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
   DECLARE_DYNAMIC_CLASS(wxPostScriptDC)


@@ -156,6 +158,9 @@ protected:
   double            m_scaleFactor;
 };
 
   double            m_scaleFactor;
 };
 

+#endif 
+        // __WXGTK__
+      

 #define wxID_PRINTER_COMMAND        1
 #define wxID_PRINTER_OPTIONS        2
 #define wxID_PRINTER_ORIENTATION    3
 #define wxID_PRINTER_COMMAND        1
 #define wxID_PRINTER_OPTIONS        2
 #define wxID_PRINTER_ORIENTATION    3


@@ -320,7 +325,4 @@ WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 #endif
         // _WX_POSTSCRPH__
        
 #endif
         // _WX_POSTSCRPH__
        

-#endif 
-        // __WXGTK__
-