wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / gtk / print.cpp

diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index beff9c1be29598f8bd26c1c5b84af488d4165e0c..d776a88b52554f7ec2b953bef2c246e4a98ce225 100644 (file)
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -51,10 +51,6 @@
 #include "wx/link.h"
 wxFORCE_LINK_THIS_MODULE(gtk_print)
 
 #include "wx/link.h"
 wxFORCE_LINK_THIS_MODULE(gtk_print)
 

-#if wxUSE_LIBGNOMEPRINT
-#include "wx/gtk/gnome/gprint.h"
-#endif
-

 #include "wx/gtk/private/object.h"
 
 // Useful to convert angles from/to Rad to/from Deg.
 #include "wx/gtk/private/object.h"
 
 // Useful to convert angles from/to Rad to/from Deg.


@@ -64,8 +60,7 @@ static const double DEG2RAD  = M_PI / 180.0;
 //----------------------------------------------------------------------------
 // wxGtkPrintModule
 // Initialized when starting the app : if it successfully load the gtk-print framework,
 //----------------------------------------------------------------------------
 // wxGtkPrintModule
 // Initialized when starting the app : if it successfully load the gtk-print framework,

-// it uses it. If not, it falls back to gnome print (see /gtk/gnome/gprint.cpp) then
-// to postscript if gnomeprint is not available.
+// it uses it. If not, it falls back to Postscript.

 //----------------------------------------------------------------------------
 
 class wxGtkPrintModule: public wxModule
 //----------------------------------------------------------------------------
 
 class wxGtkPrintModule: public wxModule


@@ -73,10 +68,6 @@ class wxGtkPrintModule: public wxModule
 public:
     wxGtkPrintModule()
     {
 public:
     wxGtkPrintModule()
     {

-#if wxUSE_LIBGNOMEPRINT
-        // This module must be initialized AFTER gnomeprint's one
-        AddDependency(wxCLASSINFO(wxGnomePrintModule));
-#endif

     }
     bool OnInit();
     void OnExit() {}
     }
     bool OnInit();
     void OnExit() {}


@@ -1209,7 +1200,7 @@ bool wxGtkPrinterDCImpl::IsOk() const
 
 void* wxGtkPrinterDCImpl::GetCairoContext() const
 {
 
 void* wxGtkPrinterDCImpl::GetCairoContext() const
 {

-    return (void*) cairo_reference( m_cairo );
+    return m_cairo;

 }
 
 void* wxGtkPrinterDCImpl::GetHandle() const
 }
 
 void* wxGtkPrinterDCImpl::GetHandle() const