projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxMotif for OS/2 adjustements. Source cleaning.
[wxWidgets.git]
/
include
/
wx
/
motif
/
app.h
diff --git
a/include/wx/motif/app.h
b/include/wx/motif/app.h
index 9a2526a1f17486a3e47b5c127f0ee91b0f1be120..41b0532808058927b873d564a61d28bdd56b8a30 100644
(file)
--- a/
include/wx/motif/app.h
+++ b/
include/wx/motif/app.h
@@
-12,15
+12,12
@@
#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
@@
-33,12
+30,14
@@
class WXDLLEXPORT wxKeyEvent;
class WXDLLEXPORT wxLog;
class WXDLLEXPORT wxEventLoop;
class WXDLLEXPORT wxXVisualInfo;
class WXDLLEXPORT wxLog;
class WXDLLEXPORT wxEventLoop;
class WXDLLEXPORT wxXVisualInfo;
-class
wxPerDisplayDataMap
;
+class
WXDLLEXPORT wxPerDisplayData
;
// ----------------------------------------------------------------------------
// the wxApp class for Motif - see wxAppBase for more details
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// the wxApp class for Motif - see wxAppBase for more details
// ----------------------------------------------------------------------------
+WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
+
class WXDLLEXPORT wxApp : public wxAppBase
{
DECLARE_DYNAMIC_CLASS(wxApp)
class WXDLLEXPORT wxApp : public wxAppBase
{
DECLARE_DYNAMIC_CLASS(wxApp)
@@
-51,14
+50,10
@@
public:
// -----------------------------------
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 Yield(bool onlyIfNeeded =
false
);
virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp
virtual bool OnInitGui();
virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp
virtual bool OnInitGui();
@@
-77,10
+72,13
@@
public:
// 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);
@@
-88,8
+86,6
@@
public:
wxXVisualInfo* GetVisualInfo(WXDisplay* display);
private:
wxXVisualInfo* GetVisualInfo(WXDisplay* display);
private:
- wxEventLoop* m_eventLoop;
-
// Motif-specific
WXAppContext m_appContext;
WXColormap m_mainColormap;
// Motif-specific
WXAppContext m_appContext;
WXColormap m_mainColormap;