#include <string.h>
-WX_DECLARE_VOIDPTR_HASH_MAP( wxXVisualInfo*, wxXVisualInfoMap );
+struct wxPerDisplayData
+{
+ wxPerDisplayData()
+ { m_visualInfo = NULL; m_topLevelWidget = NULL; }
+
+ wxXVisualInfo* m_visualInfo;
+ Widget m_topLevelWidget;
+};
+
+WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData, wxPerDisplayDataMap );
+
+static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
+ XtPointer ptr);
+static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
extern wxList wxPendingDelete;
extern bool wxAddIdleCallback();
-wxApp *wxTheApp = NULL;
-
wxHashTable *wxWidgetHashTable = NULL;
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
}
#endif // __WXDEBUG__
-long wxApp::sm_lastMessageTime = 0;
-
-bool wxApp::Initialize()
+bool wxApp::Initialize(int& argc, wxChar **argv)
{
- wxClassInfo::InitializeClasses();
-
- // GL: I'm annoyed ... I don't know where to put this and I don't want to
- // create a module for that as it's part of the core.
-#if wxUSE_THREADS
- wxPendingEventsLocker = new wxCriticalSection();
-#endif
-
- wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
- wxTheColourDatabase->Initialize();
-
- wxInitializeStockLists();
- wxInitializeStockObjects();
+ if ( !wxAppBase::Initialize(argc, argv) )
+ return false;
wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
- wxModule::RegisterModules();
- if (!wxModule::InitializeModules()) return FALSE;
-
- return TRUE;
+ return true;
}
void wxApp::CleanUp()
{
- wxModule::CleanUpModules();
-
- wxDeleteStockObjects() ;
-
- // Destroy all GDI lists, etc.
-
- wxDeleteStockLists();
-
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
-
- wxClassInfo::CleanUpClasses();
-
- delete wxTheApp;
- wxTheApp = NULL;
-
delete wxWidgetHashTable;
wxWidgetHashTable = NULL;
- // GL: I'm annoyed ... I don't know where to put this and I don't want to
- // create a module for that as it's part of the core.
-#if wxUSE_THREADS
- delete wxPendingEvents;
- delete wxPendingEventsLocker;
-#endif
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // At this point we want to check if there are any memory
- // blocks that aren't part of the wxDebugContext itself,
- // as a special case. Then when dumping we need to ignore
- // wxDebugContext, too.
- if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
- {
- wxLogDebug("There were memory leaks.\n");
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
- }
-#endif
-
- // do it as the very last thing because everything else can log messages
- wxLog::DontCreateOnDemand();
- // do it as the very last thing because everything else can log messages
- delete wxLog::SetActiveTarget(NULL);
-}
-
-// ============================================================================
-// wxEntry*
-// ============================================================================
-
-int wxEntryStart( int argc, char* argv[] )
-{
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // This seems to be necessary since there are 'rogue'
- // objects present at this point (perhaps global objects?)
- // Setting a checkpoint will ignore them as far as the
- // memory checking facility is concerned.
- // Of course you may argue that memory allocated in globals should be
- // checked, but this is a reasonable compromise.
- wxDebugContext::SetCheckpoint();
-#endif
-
- if (!wxApp::Initialize())
- return -1;
-
- return 0;
+ wxAppBase::CleanUp();
}
-int wxEntryInitGui()
+void wxApp::Exit()
{
- int retValue = 0;
-
- // GUI-specific initialization, such as creating an app context.
- if (!wxTheApp->OnInitGui())
- retValue = -1;
-
- return retValue;
-}
-
-void wxEntryCleanup()
-{
- // So dialog boxes aren't used for further messages
- delete wxLog::SetActiveTarget(new wxLogStderr);
-
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
wxApp::CleanUp();
-}
-
-int wxEntry( int argc, char *argv[] )
-{
- int retValue = 0;
-
- retValue = wxEntryStart( argc, argv );
- if (retValue) return retValue;
-
- if (!wxTheApp)
- {
- if (!wxApp::GetInitializerFunction())
- {
- printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
- return 0;
- };
-
- wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
- };
-
- if (!wxTheApp)
- {
- printf( "wxWindows error: wxTheApp == NULL\n" );
- return 0;
- };
- wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
- wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
-
- wxTheApp->argc = argc;
- wxTheApp->argv = argv;
-
- // GUI-specific initialization, such as creating an app context.
- retValue = wxEntryInitGui();
- if (retValue) return retValue;
-
- // Here frames insert themselves automatically into wxTopLevelWindows by
- // getting created in OnInit().
-
- if (wxTheApp->OnInit())
- {
- if (wxTheApp->Initialized())
- wxTheApp->OnRun();
- }
-
- if (wxTheApp->GetTopWindow())
- {
- delete wxTheApp->GetTopWindow();
- wxTheApp->SetTopWindow(NULL);
- }
-
- wxTheApp->DeletePendingObjects();
-
- retValue = wxTheApp->OnExit();
-
- wxEntryCleanup();
-
- return retValue;
+ wxAppConsole::Exit();
}
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+// ============================================================================
+// wxApp
+// ============================================================================
wxApp::wxApp()
{
m_eventLoop = new wxEventLoop;
m_mainColormap = (WXColormap) NULL;
m_appContext = (WXAppContext) NULL;
- m_topLevelWidget = (WXWidget) NULL;
- m_maxRequestSize = 0;
m_initialDisplay = (WXDisplay*) 0;
- m_visualInfoMap = new wxXVisualInfoMap;
+ m_perDisplayData = new wxPerDisplayDataMap;
}
wxApp::~wxApp()
{
delete m_eventLoop;
- for( wxXVisualInfoMap::iterator it = m_visualInfoMap->begin(),
- end = m_visualInfoMap->end();
+ for( wxPerDisplayDataMap::iterator it = m_perDisplayData->begin(),
+ end = m_perDisplayData->end();
it != end; ++it )
{
- delete it->second;
+ delete it->second.m_visualInfo;
+ XtDestroyWidget( it->second.m_topLevelWidget );
}
- delete m_visualInfoMap;
+ delete m_perDisplayData;
+
+ wxTheApp = NULL;
}
bool wxApp::Initialized()
return 0;
}
-// Processes an idle event.
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
- wxIdleEvent event;
-
- return ProcessEvent(event) && event.MoreRequested();
-}
-
void wxApp::ExitMainLoop()
{
if( m_eventLoop->IsRunning() )
inOnIdle = FALSE;
}
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
- bool needMore = FALSE;
-
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
- node = node->GetNext();
- }
-
- return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
- bool needMore = FALSE;
-
- wxIdleEvent event;
- event.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(event);
-
- if (event.MoreRequested())
- needMore = TRUE;
-
- wxWindowList::Node* node = win->GetChildren().GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->GetNext();
- }
- return needMore ;
-}
-
-void wxApp::DeletePendingObjects()
-{
- wxList::Node *node = wxPendingDelete.GetFirst();
- while (node)
- {
- wxObject *obj = node->GetData();
-
- delete obj;
-
- if (wxPendingDelete.Member(obj))
- delete node;
-
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- node = wxPendingDelete.GetFirst();
- }
-}
-
static char *fallbackResources[] = {
"*menuBar.marginHeight: 0",
"*menuBar.shadowThickness: 1",
gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
#endif // __WXDEBUG__
- wxTheApp->m_topLevelWidget =
- (WXWidget) XtAppCreateShell((String)NULL,
- wxTheApp->GetClassName().c_str(),
- applicationShellWidgetClass,dpy,
- NULL,0) ;
-
// Add general resize proc
XtActionsRec rec;
rec.string = "resize";
XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
GetMainColormap(dpy);
- m_maxRequestSize = XMaxRequestSize((Display*) dpy);
wxAddIdleCallback();
wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display )
{
- wxXVisualInfoMap::iterator it = m_visualInfoMap->find( display );
+ wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
- if( it != m_visualInfoMap->end() ) return it->second;
+ if( it != m_perDisplayData->end() && it->second.m_visualInfo )
+ return it->second.m_visualInfo;
wxXVisualInfo* vi = new wxXVisualInfo;
wxFillXVisualInfo( vi, (Display*)display );
- (*m_visualInfoMap)[display] = vi;
+ (*m_perDisplayData)[display].m_visualInfo = vi;
return vi;
}
-void wxExit()
+static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
+ XtPointer ptr)
{
- int retValue = 0;
- if (wxTheApp)
- retValue = wxTheApp->OnExit();
+ if( wxTheApp )
+ wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w),
+ (WXWidget)NULL );
+}
- wxApp::CleanUp();
- /*
- * Exit in some platform-specific way.
- * Not recommended that the app calls this:
- * only for emergencies.
- */
- exit(retValue);
+WXWidget wxCreateTopLevelWidget( WXDisplay* display )
+{
+ Widget tlw = XtAppCreateShell( (String)NULL,
+ wxTheApp->GetClassName().c_str(),
+ applicationShellWidgetClass,
+ (Display*)display,
+ NULL, 0 );
+ XtSetMappedWhenManaged( tlw, False );
+ XtRealizeWidget( tlw );
+
+ XtAddCallback( tlw, XmNdestroyCallback,
+ (XtCallbackProc)wxTLWidgetDestroyCallback,
+ (XtPointer)NULL );
+
+ return (WXWidget)tlw;
+}
+
+WXWidget wxApp::GetTopLevelWidget()
+{
+ WXDisplay* display = wxGetDisplay();
+ wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
+
+ if( it != m_perDisplayData->end() && it->second.m_topLevelWidget )
+ return (WXWidget)it->second.m_topLevelWidget;
+
+ WXWidget tlw = wxCreateTopLevelWidget( display );
+ SetTopLevelWidget( display, tlw );
+
+ return tlw;
+}
+
+void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)
+{
+ (*m_perDisplayData)[display].m_topLevelWidget = (Widget)widget;
}
// Yield to other processes
projects / wxWidgets.git / blobdiff