#4479: wx.ComboBox needs a SetFont method

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

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 8f8b632ba82f3bcf57d1cab6ddcef49a66da23c7..eef7c9e05429d2ae196d7191857c668150be780b 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -12,86 +12,71 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

-#ifdef __GNUG__
-#pragma interface "app.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/event.h"
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/event.h"

+#include "wx/hashmap.h"

 
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxEventLoop;
-class WXDLLEXPORT wxXVisualInfo;
-class wxPerDisplayDataMap;
+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 wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
+class WXDLLIMPEXP_FWD_CORE wxPerDisplayData;

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

-class WXDLLEXPORT wxApp : public wxAppBase
+WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
+
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase

 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 {
     DECLARE_DYNAMIC_CLASS(wxApp)

-        
+

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

-    
+

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

-    
+

     virtual int MainLoop();
     virtual int MainLoop();

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

 
     virtual void Exit();
 
 
     virtual void Exit();
 

-    virtual bool Yield(bool onlyIfNeeded = FALSE);
-    virtual bool ProcessIdle();
+    virtual bool Yield(bool onlyIfNeeded = false);

     virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp
     virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp

-    
-    virtual bool OnInitGui();
-    
+

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

 protected:
     bool                  m_showOnInit;
 protected:
     bool                  m_showOnInit;

-    
+

 public:
     // Implementation
 public:
     // Implementation

-    virtual bool Initialize(int argc, wxChar **argv);
+    virtual bool Initialize(int& argc, wxChar **argv);

     virtual void CleanUp();
     virtual void CleanUp();

-    
+

     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
     WXWidget       GetTopLevelWidget();
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
     WXWidget       GetTopLevelWidget();

+    WXWidget       GetTopLevelRealizedWidget();

     WXColormap     GetMainColormap(WXDisplay* display);
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
 
     void           SetTopLevelWidget(WXDisplay* display, WXWidget widget);
     WXColormap     GetMainColormap(WXDisplay* display);
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
 
     void           SetTopLevelWidget(WXDisplay* display, WXWidget widget);

+    void           SetTopLevelRealizedWidget(WXDisplay* display,
+                                             WXWidget widget);

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


@@ -99,19 +84,12 @@ public:
     wxXVisualInfo* GetVisualInfo(WXDisplay* display);
 
 private:
     wxXVisualInfo* GetVisualInfo(WXDisplay* display);
 
 private:

-    wxEventLoop*    m_eventLoop;
-    

     // Motif-specific
     WXAppContext          m_appContext;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     wxPerDisplayDataMap*  m_perDisplayData;
     // Motif-specific
     WXAppContext          m_appContext;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     wxPerDisplayDataMap*  m_perDisplayData;

-
-    DECLARE_EVENT_TABLE()

 };
 
 };
 

-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-

 #endif
 // _WX_APP_H_
 #endif
 // _WX_APP_H_

-