fix typo in last commit

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

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 985a7e22e187a7640379902528835d99b8093f49..8879381460d0d245d93efea91629567dc862a152 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -23,14 +23,14 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // forward declarations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxEventLoop;
-class WXDLLEXPORT wxXVisualInfo;
-class WXDLLEXPORT wxPerDisplayData;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_BASE wxLog;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
+class WXDLLIMPEXP_FWD_CORE wxPerDisplayData;

 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details
 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details


@@ -38,7 +38,7 @@ class WXDLLEXPORT wxPerDisplayData;
 
 WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
 
 
 WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 


@@ -53,11 +53,8 @@ public:
 
     virtual void Exit();
 
 
     virtual void Exit();
 

-    virtual bool Yield(bool onlyIfNeeded = false);

     virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp
 
     virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp
 

-    virtual bool OnInitGui();
-

     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 


@@ -68,6 +65,7 @@ public:
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();

+    virtual bool DoYield(bool onlyIfNeeded, long eventsToProcess);

 
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
 
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }


@@ -91,8 +89,6 @@ private:
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     wxPerDisplayDataMap*  m_perDisplayData;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     wxPerDisplayDataMap*  m_perDisplayData;

-
-    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif