X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dff340069297c51f04fcd230282b86eee6943db..f4bd67593eae8df6e9a9eb0b7e1374833dbc2a70:/src/motif/frame.cpp diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 5984fe2b59..5092f9fa1a 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -50,6 +50,7 @@ #include #include +#include #if XmVersion >= 1002 #include #else @@ -73,6 +74,7 @@ #endif #include "wx/motif/private.h" +#include "wx/unix/utilsx11.h" // ---------------------------------------------------------------------------- // private functions @@ -149,9 +151,9 @@ bool wxFrame::Create(wxWindow *parent, m_windowStyle = style; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); 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; @@ -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) @@ -629,10 +629,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 +640,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) @@ -689,7 +704,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar) // 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 )