Temporary fix for link error to ~wxZipOutputStream()

[wxWidgets.git] / src / gtk1 / app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index e370b546658ea0c546f4c0c0cb078839a0923903..dbe83542dc3e0aff07d0cc5960b7df556d4690f5 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -80,13 +80,6 @@
 
 #include <gtk/gtk.h>
 
-#if wxUSE_LIBGNOMEPRINT
-
-#include "wx/html/forcelnk.h"
-FORCE_LINK(gnome_print)
-
-#endif
-
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -454,6 +447,7 @@ wxApp::wxApp()
 
     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
+    m_glFBCInfo = (void *) NULL;
 }
 
 wxApp::~wxApp()
@@ -612,6 +606,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         wxConvCurrent = (wxMBConv*) NULL;
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
 
+#ifdef __WXGTK20__
+    m_convBrokenFileNames = new wxConvBrokenFileNames;
+    m_oldConvFileName = wxConvFileName;
+    wxConvFileName = m_convBrokenFileNames;
+#endif
+
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
     int i;
@@ -686,6 +686,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
 void wxApp::CleanUp()
 {
+#ifdef __WXGTK20__
+    delete m_convBrokenFileNames;
+    wxConvFileName = m_oldConvFileName;
+#endif
+
     gdk_threads_leave();
 
     wxAppBase::CleanUp();