projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
w32api 2.0 will have shlwapi.h
[wxWidgets.git]
/
src
/
motif
/
mdi.cpp
diff --git
a/src/motif/mdi.cpp
b/src/motif/mdi.cpp
index f8aa8af3f064a1e7b193ded08e692bc83664598d..4fa16b4cfe044b1c17efb048d89d95332c9c8022 100644
(file)
--- a/
src/motif/mdi.cpp
+++ b/
src/motif/mdi.cpp
@@
-335,9
+335,9
@@
bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
SetName(name);
SetWindowStyleFlag(style);
SetName(name);
SetWindowStyleFlag(style);
- m_backgroundColour = wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
m_foregroundColour = *wxBLACK;
m_foregroundColour = *wxBLACK;
- m_font = wxSystemSettings::Get
System
Font(wxSYS_DEFAULT_GUI_FONT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
if ( id > -1 )
m_windowId = id;
if ( id > -1 )
m_windowId = id;
@@
-527,14
+527,20
@@
void wxMDIChildFrame::SetMenuBar(wxMenuBar *menuBar)
// Set icon
void wxMDIChildFrame::SetIcon(const wxIcon& icon)
{
// Set icon
void wxMDIChildFrame::SetIcon(const wxIcon& icon)
{
- m_icon = icon;
- if (m_icon.Ok())
+ m_icons = wxIconBundle( icon );
+
+ if (icon.Ok())
{
// Not appropriate since there are no icons in
// a tabbed window
}
}
{
// Not appropriate since there are no icons in
// a tabbed window
}
}
+void wxMDIChildFrame::SetIcons(const wxIconBundle& icons)
+{
+ m_icons = icons;
+}
+
void wxMDIChildFrame::SetTitle(const wxString& title)
{
m_title = title;
void wxMDIChildFrame::SetTitle(const wxString& title)
{
m_title = title;
@@
-621,7
+627,7
@@
bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
SetWindowStyleFlag(style);
// m_windowParent = parent;
SetWindowStyleFlag(style);
// m_windowParent = parent;
- // m_backgroundColour = wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_APPWORKSPACE);
+ // m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
if (success)
bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
if (success)