Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 8d7f62f1d917e162688e982f73cf6bcc5eaf1471..3621558b9f41e46a9b4b70c7a367cc8ff812d8a1 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -35,7 +35,7 @@ class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxEventLoop;
 
 // ----------------------------------------------------------------------------

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

 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxApp : public wxAppBase
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxApp : public wxAppBase


@@ -44,7 +44,7 @@ class WXDLLEXPORT wxApp : public wxAppBase
         
 public:
     wxApp();
         
 public:
     wxApp();

-    ~wxApp() {}
+    ~wxApp();

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


@@ -55,11 +55,10 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);

+    virtual bool ProcessIdle();

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

-    virtual wxIcon GetStdIcon(int which) const;
-    

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


@@ -74,10 +73,11 @@ public:
     bool SendIdleEvents(wxWindow* win);
     
     // Processes an X event.
     bool SendIdleEvents(wxWindow* win);
     
     // Processes an X event.

-    virtual void ProcessXEvent(WXEvent* event);
+    virtual bool ProcessXEvent(WXEvent* event);

     
     

-    // Returns TRUE if an accelerator has been processed
-    virtual bool CheckForAccelerator(WXEvent* event);
+#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;


@@ -88,26 +88,60 @@ public:
     static void CleanUp();
     
     void DeletePendingObjects();
     static void CleanUp();
     
     void DeletePendingObjects();

-    bool ProcessIdle();

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

-    WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }

     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     
     // This handler is called when a property change event occurs
     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     
     // This handler is called when a property change event occurs

-    virtual void   HandlePropertyChange(WXEvent *event);
-    
+    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; }
+    
+#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    
+    
+    // We need this before creating the app
+    static   WXDisplay* GetDisplay() { return ms_display; }
+    static   WXDisplay* ms_display;
+

 public:
 public:

-    static long    sm_lastMessageTime;
-    int            m_nCmdShow;
+    static long           sm_lastMessageTime;
+    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;
+#endif

     
 protected:
     bool                  m_keepGoing;
     
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
     
 protected:
     bool                  m_keepGoing;
     
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;

-    WXDisplay*            m_initialDisplay;

     long                  m_maxRequestSize;
     wxEventLoop*          m_mainLoop;
     
     long                  m_maxRequestSize;
     wxEventLoop*          m_mainLoop;