don't use a floating point value as a boolean flag; gcc4 (correctly) complains when...

[wxWidgets.git] / include / wx / gtk / app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index d80afdb2fdb915797fbe75e3cbe99b9055c6b3c4..c5e991ba0e5c19cf10c102fdf8e334f5293a02eb 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -10,10 +10,6 @@
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 #include "wx/frame.h"
 #include "wx/icon.h"
 #include "wx/strconv.h"
 #include "wx/frame.h"
 #include "wx/icon.h"
 #include "wx/strconv.h"


@@ -22,14 +18,14 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxApp;
-class wxLog;
+class WXDLLIMPEXP_CORE wxApp;
+class WXDLLIMPEXP_BASE wxLog;

 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 

-class wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase

 {
 public:
     wxApp();
 {
 public:
     wxApp();


@@ -69,11 +65,6 @@ public:
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();
     
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();
     

-#ifdef __WXGTK20__
-    wxConvBrokenFileNames *m_convBrokenFileNames;
-    wxMBConv *m_oldConvFileName;
-#endif
-

 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__