A few tweaks and cleanups

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 5984fe2b591df5a80c46e3b4fa6d500e4c6a642d..5092f9fa1a3efc0c29df7b416fa8c40023d09a5f 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 <Xm/Xm.h>
 #include <X11/Shell.h>

+#include <X11/Core.h>

 #if XmVersion >= 1002
     #include <Xm/XmAll.h>
 #else
 #if XmVersion >= 1002
     #include <Xm/XmAll.h>
 #else


@@ -73,6 +74,7 @@
 #endif
 
 #include "wx/motif/private.h"
 #endif
 
 #include "wx/motif/private.h"

+#include "wx/unix/utilsx11.h"

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -149,9 +151,9 @@ bool wxFrame::Create(wxWindow *parent,
 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

 
     if ( id > -1 )
         m_windowId = id;
 
     if ( id > -1 )
         m_windowId = id;


@@ -304,8 +306,6 @@ bool wxFrame::Create(wxWindow *parent,
             decor |= MWM_DECOR_TITLE;
         if (style & wxTHICK_FRAME)
             decor |= MWM_DECOR_BORDER;
             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)
         if (style & wxMINIMIZE_BOX)
             decor |= MWM_DECOR_MINIMIZE;
         if (style & wxMAXIMIZE_BOX)


@@ -629,10 +629,8 @@ void wxFrame::SetTitle(const wxString& title)
         NULL);
 }
 
         NULL);
 }
 

-void wxFrame::SetIcon(const wxIcon& icon)
+void wxFrame::DoSetIcon(const wxIcon& icon)

 {
 {

-    m_icon = icon;
-

     if (!m_frameShell)
         return;
 
     if (!m_frameShell)
         return;
 


@@ -642,6 +640,23 @@ void wxFrame::SetIcon(const wxIcon& icon)
     XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon.GetPixmap(), NULL);
 }
 
     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)
 void wxFrame::PositionStatusBar()
 {
     if (!m_frameStatusBar)


@@ -689,7 +704,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

     Refresh();
 
     if ( m_frameStatusBar )
     Refresh();
 
     if ( m_frameStatusBar )