X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..2724d84bbefd440b4e63997eb45ec9636bcd955d:/include/wx/x11/app.h diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h index ac5f86fdce..3d669c5b86 100644 --- 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 wxLog; +class WXDLLIMPEXP_FWD_BASE wxLog; 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(); @@ -45,7 +45,6 @@ public: virtual void Exit(); - virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void WakeUpIdle(); virtual bool OnInitGui(); @@ -56,10 +55,6 @@ public: // 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); @@ -84,7 +79,7 @@ public: PangoContext* GetPangoContext(); #endif - wxXVisualInfo* GetVisualInfo(WXDisplay* display) + wxXVisualInfo* GetVisualInfo(WXDisplay* WXUNUSED(display)) { // this should be implemented correctly for wxBitmap to work // with multiple display