X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50414e24a7aa082f2569666421d3ee1ea581a3cd..fd71308fc89eac2dd212b715eba68a993fa78f53:/src/motif/frame.cpp diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 516b5a6765..e83b831ebc 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -76,7 +76,7 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) #endif -#if USE_NATIVE_STATUSBAR +#if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_useNativeStatusBar = TRUE; #else bool wxFrame::m_useNativeStatusBar = FALSE; @@ -222,7 +222,7 @@ bool wxFrame::Create(wxWindow *parent, m_mainWidget = m_frameWidget; // This patch comes from Torsten Liermann lier@lier1.muc.de - if (XmIsMotifWMRunning( (Widget) wxTheApp->GetTopLevelWidget())) + if (XmIsMotifWMRunning( (Widget) m_frameShell )) { int decor = 0 ; if (style & wxRESIZE_BORDER) @@ -248,7 +248,7 @@ bool wxFrame::Create(wxWindow *parent, else { if (style == 0) - XtVaSetValues((Widget) m_frameShell,XmNoverrideRedirect,TRUE,NULL); + XtVaSetValues((Widget) m_frameShell,XmNoverrideRedirect,TRUE,NULL); } XtRealizeWidget((Widget) m_frameShell); @@ -329,7 +329,7 @@ wxFrame::~wxFrame() if (wxTheApp->GetExitOnFrameDelete()) { - // TODO signal to the app that we're going to close + // Signal to the app that we're going to close wxTheApp->ExitMainLoop(); } } @@ -688,7 +688,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) void wxFrame::OnSize(wxSizeEvent& event) { // if we're using constraints - do use them - #if USE_CONSTRAINTS + #if wxUSE_CONSTRAINTS if ( GetAutoLayout() ) { Layout(); return;