Updated version to 2.5.5

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index fb7e97cffcb2b87a36494f20fc4889a1591e64e9..332a8ee06b822aef6bc21727d5344bd9ae8c6444 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -32,7 +32,6 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;

-class WXDLLEXPORT wxEventLoop;

 class WXDLLEXPORT wxXVisualInfo;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxXVisualInfo;
 
 // ----------------------------------------------------------------------------


@@ -42,63 +41,57 @@ class WXDLLEXPORT wxXVisualInfo;
 class WXDLLEXPORT wxApp : public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 class WXDLLEXPORT wxApp : public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)

-        
+

 public:
     wxApp();
     ~wxApp();
 public:
     wxApp();
     ~wxApp();

-    
+

     // override base class (pure) virtuals
     // -----------------------------------
     // override base class (pure) virtuals
     // -----------------------------------

-    
-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();

 
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
 
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();

-    
+

     virtual bool OnInitGui();
     virtual bool OnInitGui();

-    
+

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

-    
+

     // 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__
 #ifdef __WXDEBUG__
     virtual void OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg);
 #endif // __WXDEBUG__

-    
+

 protected:
     bool                  m_showOnInit;
 protected:
     bool                  m_showOnInit;

-    
+

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

-    
+

     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
     long           GetMaxRequestSize() const { return m_maxRequestSize; }

-    
+

     // This handler is called when a property change event occurs
     virtual bool HandlePropertyChange(WXEvent *event);
     // This handler is called when a property change event occurs
     virtual bool HandlePropertyChange(WXEvent *event);

-    
+

     // Values that can be passed on the command line.
     // Returns -1, -1 if none specified.
     const wxSize& GetInitialSize() const { return m_initialSize; }
     bool GetShowIconic() const { return m_showIconic; }
     // Values that can be passed on the command line.
     // Returns -1, -1 if none specified.
     const wxSize& GetInitialSize() const { return m_initialSize; }
     bool GetShowIconic() const { return m_showIconic; }

-    
+

 #if wxUSE_UNICODE
     // Global context for Pango layout. Either use X11
     // or use Xft rendering according to GDK_USE_XFT
     // environment variable
     PangoContext* GetPangoContext();
 #if wxUSE_UNICODE
     // Global context for Pango layout. Either use X11
     // or use Xft rendering according to GDK_USE_XFT
     // environment variable
     PangoContext* GetPangoContext();

-#endif    
+#endif

 
     wxXVisualInfo* GetVisualInfo(WXDisplay* display)
     {
 
     wxXVisualInfo* GetVisualInfo(WXDisplay* display)
     {


@@ -113,21 +106,20 @@ public:
 
 public:
     static long           sm_lastMessageTime;
 
 public:
     static long           sm_lastMessageTime;

-    bool                  m_showIconic;    
+    bool                  m_showIconic;

     wxSize                m_initialSize;
 
 #if !wxUSE_NANOX
     wxXVisualInfo*        m_visualInfo;
 #endif
     wxSize                m_initialSize;
 
 #if !wxUSE_NANOX
     wxXVisualInfo*        m_visualInfo;
 #endif

-    
+

 protected:
     bool                  m_keepGoing;
 protected:
     bool                  m_keepGoing;

-    
+

     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
     long                  m_maxRequestSize;
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
     long                  m_maxRequestSize;

-    wxEventLoop*          m_mainLoop;
-    
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };