Ignore DOS drive spec in GetRightLocation

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 14b660afe3491e0795b550137c7ed5e4f7758f6e..2d07cc18c09eb38d1c773aa37e6cb99a022f8622 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -50,6 +50,7 @@
 
 #include <Xm/Xm.h>
 #include <X11/Shell.h>
+#include <X11/Core.h>
 #if XmVersion >= 1002
     #include <Xm/XmAll.h>
 #else
@@ -73,6 +74,7 @@
 #endif
 
 #include "wx/motif/private.h"
+#include "wx/unix/utilsx11.h"
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -304,8 +306,6 @@ bool wxFrame::Create(wxWindow *parent,
             decor |= MWM_DECOR_TITLE;
         if (style & wxTHICK_FRAME)
             decor |= MWM_DECOR_BORDER;
-        if (style & wxTHICK_FRAME)
-            decor |= MWM_DECOR_BORDER;
         if (style & wxMINIMIZE_BOX)
             decor |= MWM_DECOR_MINIMIZE;
         if (style & wxMAXIMIZE_BOX)
@@ -383,6 +383,12 @@ wxFrame::~wxFrame()
         m_frameStatusBar = NULL;
     }
 
+    if (m_frameToolBar)
+    {
+        delete m_frameToolBar;
+        m_frameToolBar = NULL;
+    }
+
     DestroyChildren();
 
     if (m_workArea)
@@ -392,6 +398,11 @@ wxFrame::~wxFrame()
         XtDestroyWidget ((Widget) m_workArea);
     }
 
+    // We need to destroy the base class icons here before we stop
+    // the event loop. This is a hack until we have a real top level
+    // window (which would be responsible for killing the event loop).
+    m_icons.m_icons.Empty();
+
     if (m_frameWidget)
     {
         wxDeleteWindowFromTable((Widget) m_frameWidget);
@@ -629,10 +640,8 @@ void wxFrame::SetTitle(const wxString& title)
         NULL);
 }
 
-void wxFrame::SetIcon(const wxIcon& icon)
+void wxFrame::DoSetIcon(const wxIcon& icon)
 {
-    m_icon = icon;
-
     if (!m_frameShell)
         return;
 
@@ -642,6 +651,23 @@ void wxFrame::SetIcon(const wxIcon& icon)
     XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon.GetPixmap(), NULL);
 }
 
+void wxFrame::SetIcon(const wxIcon& icon)
+{
+    SetIcons( wxIconBundle( icon ) );
+}
+
+void wxFrame::SetIcons(const wxIconBundle& icons)
+{
+    wxFrameBase::SetIcons( icons );
+
+    if (!m_frameShell)
+        return;
+
+    DoSetIcon( m_icons.GetIcon( -1 ) );
+    wxSetIconsX11(GetXDisplay(),
+                  (WXWindow) XtWindow( (Widget) m_frameShell ), icons);
+}
+
 void wxFrame::PositionStatusBar()
 {
     if (!m_frameStatusBar)