make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index d80afdb2fdb915797fbe75e3cbe99b9055c6b3c4..db2d753e3d09f93a91f56c5a26021bfd05986ca8 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/app.h
+// Name:        wx/gtk1/app.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -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_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_BASE wxLog;

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

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

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


@@ -58,7 +54,7 @@ public:
 
     gint            m_idleTag;
     void RemoveIdleTag();
 
     gint            m_idleTag;
     void RemoveIdleTag();

-    
+

     unsigned char  *m_colorCube;
 
     // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
     unsigned char  *m_colorCube;
 
     // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual


@@ -68,11 +64,6 @@ public:
     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();
     // This returns the current visual: either that used by wxRootWindow
     // 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
 
 private:
     // true if we're inside an assert modal dialog


@@ -81,7 +72,6 @@ private:
 #endif // __WXDEBUG__
 
     DECLARE_DYNAMIC_CLASS(wxApp)
 #endif // __WXDEBUG__
 
     DECLARE_DYNAMIC_CLASS(wxApp)

-    DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKAPPH__
 };
 
 #endif // __GTKAPPH__