always let the multiline text control process the Enter key presses

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 8cb604c6a13879d74274d1141083ed41e8e45e24..ec6c5a703f64d6623d7d4bf7ec5b207068d86413 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -23,6 +23,7 @@
 
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxLog;

+class WXDLLEXPORT wxEventLoop;

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


@@ -47,8 +48,6 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
 
     virtual bool Pending();
     virtual void Dispatch();
 

-    virtual wxIcon GetStdIcon(int which) const;
-

     // implementation only from now on
     void OnIdle(wxIdleEvent &event);
     bool SendIdleEvents();
     // implementation only from now on
     void OnIdle(wxIdleEvent &event);
     bool SendIdleEvents();


@@ -60,9 +59,17 @@ public:
     bool ProcessIdle();
     void DeletePendingObjects();
 
     bool ProcessIdle();
     void DeletePendingObjects();
 

+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+
+    virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; }
+    virtual bool SetDisplayMode(const wxDisplayModeInfo& mode);
+

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

+    
+    wxEventLoop *m_mainLoop;
+    wxDisplayModeInfo m_displayMode;

 };
 
 int WXDLLEXPORT wxEntry(int argc, char *argv[]);
 };
 
 int WXDLLEXPORT wxEntry(int argc, char *argv[]);