Applied Russel's changes to wxToolBarBase

[wxWidgets.git] / include / wx / gtk1 / dcps.h

diff --git a/include/wx/gtk1/dcps.h b/include/wx/gtk1/dcps.h
index 33c03a2f0d5676c88d813eb47b260868cca16a5d..df8f2d0b092decbc0ae0db136c3d1914db1c7d7c 100644 (file)
--- a/include/wx/gtk1/dcps.h
+++ b/include/wx/gtk1/dcps.h
@@ -16,11 +16,13 @@
 #endif
 
 #include "wx/dc.h"
+
+#if wxUSE_POSTSCRIPT
+
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include <fstream.h>
 
-#if wxUSE_POSTSCRIPT
 
 //-----------------------------------------------------------------------------
 // classes
@@ -45,10 +47,12 @@ public:
 
   bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
 
+  virtual bool Ok() const;
+
   virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
 
-  inline virtual void BeginDrawing(void) {} ;
-  inline virtual void EndDrawing(void) {} ;
+  virtual void BeginDrawing() {}
+  virtual void EndDrawing() {}
 
   void FloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE) ;
   bool GetPixel(long x1, long y1, wxColour *col) const;
@@ -80,8 +84,7 @@ public:
 
   void DrawIcon( const wxIcon& icon, long x, long y );
   void DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );
-  
-  
+
   void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
 
   void Clear();
@@ -90,7 +93,7 @@ public:
   void SetBrush( const wxBrush& brush );
   void SetLogicalFunction( int function );
   void SetBackground( const wxBrush& brush );
-  
+
   void SetClippingRegion(long x, long y, long width, long height);
   void SetClippingRegion( const wxRegion &region );
   void DestroyClippingRegion();
@@ -107,16 +110,16 @@ public:
                      long *descent = (long *) NULL,
                      long *externalLeading = (long *) NULL,
                      wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE);
-                    
+
   void GetSize(int* width, int* height) const;
   void GetSizeMM(long *width, long *height) const;
 
   void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
   void SetDeviceOrigin( long x, long y );
-  
-  inline void SetBackgroundMode(int WXUNUSED(mode)) {};
+
+  inline void SetBackgroundMode(int WXUNUSED(mode)) {}
   inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
-  
+
   inline ofstream *GetStream(void) const { return m_pstream; }
 
 protected:
@@ -132,7 +135,7 @@ protected:
   double            m_underlineThickness;
 };
 
-#endif 
+#endif
     // wxUSE_POSTSCRIPT
 
 #endif