Works a little better when you remember to say "virtual"

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 77927b4f49e4c4cfcc6988d12eb80a1f76f4409b..fb7e97cffcb2b87a36494f20fc4889a1591e64e9 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -12,7 +12,7 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "app.h"
 #endif
 
 #pragma interface "app.h"
 #endif
 


@@ -33,6 +33,7 @@ class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;

+class WXDLLEXPORT wxXVisualInfo;

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


@@ -54,23 +55,17 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();

+
+    virtual void Exit();
+

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

+    virtual void WakeUpIdle();

     
     virtual bool OnInitGui();
     
     // implementation from now on
     // --------------------------
     
     
     virtual bool OnInitGui();
     
     // 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);
     


@@ -83,11 +78,8 @@ protected:
     
 public:
     // Implementation
     
 public:
     // Implementation

-    static bool Initialize();
-    static void CleanUp();
-    
-    void DeletePendingObjects();
-    bool ProcessIdle();
+    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);


@@ -101,6 +93,20 @@ public:
     const wxSize& GetInitialSize() const { return m_initialSize; }
     bool GetShowIconic() const { return m_showIconic; }
     
     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();
+#endif    
+
+    wxXVisualInfo* GetVisualInfo(WXDisplay* display)
+    {
+        // this should be implemented correctly for wxBitmap to work
+        // with multiple display
+        return m_visualInfo;
+    }
+

     // We need this before creating the app
     static   WXDisplay* GetDisplay() { return ms_display; }
     static   WXDisplay* ms_display;
     // We need this before creating the app
     static   WXDisplay* GetDisplay() { return ms_display; }
     static   WXDisplay* ms_display;


@@ -110,24 +116,8 @@ public:
     bool                  m_showIconic;    
     wxSize                m_initialSize;
 
     bool                  m_showIconic;    
     wxSize                m_initialSize;
 

-#if !wxUSE_NANOX    
-    // Someone find a better place for these
-    int                   m_visualType;   // TrueColor, DirectColor etc.
-    int                   m_visualDepth;
-    int                   m_visualColormapSize;
-    void                 *m_visualColormap;
-    int                   m_visualScreen;
-    unsigned long         m_visualRedMask;
-    unsigned long         m_visualGreenMask;
-    unsigned long         m_visualBlueMask;
-    int                   m_visualRedShift;
-    int                   m_visualGreenShift;
-    int                   m_visualBlueShift;
-    int                   m_visualRedPrec;
-    int                   m_visualGreenPrec;
-    int                   m_visualBluePrec;
-    
-    unsigned char        *m_colorCube;
+#if !wxUSE_NANOX
+    wxXVisualInfo*        m_visualInfo;

 #endif
     
 protected:
 #endif
     
 protected:


@@ -141,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_