use symbolic name for the shell menu bar too; include resources.h in wince.rc directl...

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 1142fd2da675b2300691504c2609a8cba995ef10..8bd35c976032f56d720774d5ff202b7c69218e61 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.h
+// Name:        wx/mgl/app.h

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -10,20 +10,17 @@
 #ifndef __WX_APP_H__
 #define __WX_APP_H__
 
 #ifndef __WX_APP_H__
 #define __WX_APP_H__
 

-#ifdef __GNUG__
-#pragma interface "app.h"
-#endif
-

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

+#include "wx/vidmode.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;

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


@@ -33,7 +30,7 @@ class WXDLLEXPORT wxApp: public wxAppBase
 {
 public:
     wxApp();
 {
 public:
     wxApp();

-    ~wxApp();
+    virtual ~wxApp();

 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by


@@ -42,34 +39,20 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals

-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();
-    virtual bool ProcessIdle();
-
-    // implementation only from now on
-    void OnIdle(wxIdleEvent &event);
-    bool SendIdleEvents();
-    bool SendIdleEvents(wxWindow* win);
-

     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
 
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
 

+    virtual void Exit();
+    virtual void WakeUpIdle();

     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 

-    virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; }
-    virtual bool SetDisplayMode(const wxDisplayModeInfo& mode);
+    virtual wxVideoMode GetDisplayMode() const { return m_displayMode; }
+    virtual bool SetDisplayMode(const wxVideoMode& mode);

 
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)

-    DECLARE_EVENT_TABLE()
-    
-    wxEventLoop *m_mainLoop;
-    wxDisplayModeInfo m_displayMode;
-};

 
 

-int WXDLLEXPORT wxEntry(int argc, char *argv[]);
+    wxVideoMode m_displayMode;
+};

 
 #endif // __WX_APP_H__
 
 #endif // __WX_APP_H__