Set the correct svn properties on the new files. Correct a minor date typo.

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index a32699073a91c14dd744c96436e2b942ff06bc4b..3d669c5b86999bf13a60e2a6f0deea6090193928 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -27,14 +27,14 @@ class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;

-class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;

 class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
 
 // ----------------------------------------------------------------------------
 // the wxApp class for wxX11 - see wxAppBase for more details
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
 
 // ----------------------------------------------------------------------------
 // the wxApp class for wxX11 - see wxAppBase for more details
 // ----------------------------------------------------------------------------
 

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

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


@@ -45,7 +45,6 @@ public:
 
     virtual void Exit();
 
 
     virtual void Exit();
 

-    virtual bool Yield(bool onlyIfNeeded = FALSE);

     virtual void WakeUpIdle();
 
     virtual bool OnInitGui();
     virtual void WakeUpIdle();
 
     virtual bool OnInitGui();


@@ -56,10 +55,6 @@ public:
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
 
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
 

-#ifdef __WXDEBUG__
-    virtual void OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg);
-#endif // __WXDEBUG__
-

 public:
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);
 public:
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);