Dialog unit mods; wxProp tidying

[wxWidgets.git] / src / motif / frame.cpp

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 516b5a67658e56e4f2c797be9548b457c225f5fc..e83b831ebcfca7b4a496df9fb95b65f168b9eb05 100644 (file)
--- 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;