[start of] cleanup uxtheme support code

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 20e3dfb2b506c9a8a65cab2a4dabac99ecd232e5..d1de31870d6c7a4003c7a5f2fee9396a0e534705 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -59,7 +59,6 @@ public:
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);

-    virtual bool ProcessIdle();

     virtual void WakeUpIdle();
     
     virtual bool OnInitGui();
     virtual void WakeUpIdle();
     
     virtual bool OnInitGui();


@@ -67,16 +66,6 @@ public:
     // implementation from now on
     // --------------------------
     
     // implementation from now on
     // --------------------------
     

-    void OnIdle(wxIdleEvent& event);
-    
-    // Send idle event to all top-level windows.
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents();
-    
-    // Send idle event to window and all subwindows
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents(wxWindow* win);
-    

     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
     
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
     


@@ -89,10 +78,8 @@ protected:
     
 public:
     // Implementation
     
 public:
     // Implementation

-    static bool Initialize();
-    static void CleanUp();
-    
-    void DeletePendingObjects();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

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


@@ -144,8 +131,5 @@ protected:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
-#endif
-// _WX_APP_H_
+#endif // _WX_APP_H_