Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 8d7f62f1d917e162688e982f73cf6bcc5eaf1471..3d669c5b86999bf13a60e2a6f0deea6090193928 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.h
+// Name:        wx/x11/app.h

 // Purpose:     wxApp class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxApp class
 // Author:      Julian Smart
 // Modified by:


@@ -9,12 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_APP_H_
-#define _WX_APP_H_
-
-#ifdef __GNUG__
-#pragma interface "app.h"
-#endif
+#ifndef _WX_X11_APP_H_
+#define _WX_X11_APP_H_

 
 // ----------------------------------------------------------------------------
 // headers
 
 // ----------------------------------------------------------------------------
 // headers


@@ -27,95 +23,85 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // forward declarations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_BASE wxLog;
+class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// 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 WXDLLIMPEXP_CORE wxApp : public wxAppBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxApp)
-        

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

-    ~wxApp() {}
-    
+    virtual ~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 bool Yield(bool onlyIfNeeded = FALSE);
-    
+
+    virtual void Exit();
+
+    virtual void WakeUpIdle();
+

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

-    
-    virtual wxIcon GetStdIcon(int which) const;
-    
+

     // 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.
     // Processes an X event.

-    virtual void ProcessXEvent(WXEvent* event);
-    
-    // Returns TRUE if an accelerator has been processed
-    virtual bool CheckForAccelerator(WXEvent* event);
-    
-protected:
-    bool                  m_showOnInit;
-    
+    virtual bool ProcessXEvent(WXEvent* event);
+

 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);

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

     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     long           GetMaxRequestSize() const { return m_maxRequestSize; }

-    
+

     // This handler is called when a property change event occurs
     // 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
+
+    wxXVisualInfo* GetVisualInfo(WXDisplay* WXUNUSED(display))
+    {
+        // this should be implemented correctly for wxBitmap to work
+        // with multiple display
+        return m_visualInfo;
+    }
+

 public:
 public:

-    static long    sm_lastMessageTime;
-    int            m_nCmdShow;
-    
+    static long           sm_lastMessageTime;
+    bool                  m_showIconic;
+    wxSize                m_initialSize;
+
+#if !wxUSE_NANOX
+    wxXVisualInfo*        m_visualInfo;
+#endif
+

 protected:
 protected:

-    bool                  m_keepGoing;
-    

     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;

-    WXDisplay*            m_initialDisplay;

     long                  m_maxRequestSize;
     long                  m_maxRequestSize;

-    wxEventLoop*          m_mainLoop;
-    
-    DECLARE_EVENT_TABLE()
-};

 
 

-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+    DECLARE_DYNAMIC_CLASS(wxApp)
+};

 
 

-#endif
-// _WX_APP_H_
+#endif // _WX_X11_APP_H_