projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Michael Fieldings patch 598106 applied in part
[wxWidgets.git]
/
src
/
mac
/
dialog.cpp
diff --git
a/src/mac/dialog.cpp
b/src/mac/dialog.cpp
index 8a066964ca05483659bf1da95be611489b782a0a..959fe01dfd920f3e0987031b26ac0315d3180c1d 100644
(file)
--- a/
src/mac/dialog.cpp
+++ b/
src/mac/dialog.cpp
@@
-30,7
+30,7
@@
extern wxList wxPendingDelete;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-BEGIN_EVENT_TABLE(wxDialog, wx
TopLevelWindow
)
+BEGIN_EVENT_TABLE(wxDialog, wx
DialogBase
)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
@@
-47,7
+47,7
@@
END_EVENT_TABLE()
wxDialog::wxDialog()
{
m_isShown = FALSE;
wxDialog::wxDialog()
{
m_isShown = FALSE;
- SetBackgroundColour(wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
}
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
}
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
@@
-58,7
+58,7
@@
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
const wxString& name)
{
- SetBackgroundColour(wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
@@
-67,6
+67,7
@@
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) , name ) ;
m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) , name ) ;
m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
+ SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
return TRUE;
}
return TRUE;
}
@@
-216,7
+217,7
@@
void wxDialog::EndModal(int retCode)
}
// Standard buttons
}
// Standard buttons
-void wxDialog::OnOK(wxCommandEvent&
event
)
+void wxDialog::OnOK(wxCommandEvent&
WXUNUSED(event)
)
{
if ( Validate() && TransferDataFromWindow() )
{
{
if ( Validate() && TransferDataFromWindow() )
{
@@
-224,19
+225,19
@@
void wxDialog::OnOK(wxCommandEvent& event)
}
}
}
}
-void wxDialog::OnApply(wxCommandEvent&
event
)
+void wxDialog::OnApply(wxCommandEvent&
WXUNUSED(event)
)
{
if (Validate())
TransferDataFromWindow();
// TODO probably need to disable the Apply button until things change again
}
{
if (Validate())
TransferDataFromWindow();
// TODO probably need to disable the Apply button until things change again
}
-void wxDialog::OnCancel(wxCommandEvent&
event
)
+void wxDialog::OnCancel(wxCommandEvent&
WXUNUSED(event)
)
{
{
-
EndModal(wxID_CANCEL);
+ EndModal(wxID_CANCEL);
}
}
-void wxDialog::OnCloseWindow(wxCloseEvent&
event
)
+void wxDialog::OnCloseWindow(wxCloseEvent&
WXUNUSED(event)
)
{
// We'll send a Cancel message by default,
// which may close the dialog.
{
// We'll send a Cancel message by default,
// which may close the dialog.
@@
-266,9
+267,9
@@
void wxDialog::OnCloseWindow(wxCloseEvent& event)
closing.DeleteObject(this);
}
closing.DeleteObject(this);
}
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent&
event
)
+void wxDialog::OnSysColourChanged(wxSysColourChangedEvent&
WXUNUSED(event)
)
{
{
- SetBackgroundColour(wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
}
Refresh();
}