projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build fix. Need the full declaration for CLASSINFO().
[wxWidgets.git]
/
src
/
msw
/
dialog.cpp
diff --git
a/src/msw/dialog.cpp
b/src/msw/dialog.cpp
index ac887e8c85b402bf88938ecb512e06eb3971cd48..d528829c9d7eabb5aa2b1dda1a59b81309857a57 100644
(file)
--- a/
src/msw/dialog.cpp
+++ b/
src/msw/dialog.cpp
@@
-70,7
+70,7
@@
static wxWindowList wxModalDialogs;
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
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)
@@
-98,7
+98,7
@@
void wxDialog::Init()
m_windowDisabler = (wxWindowDisabler *)NULL;
m_windowDisabler = (wxWindowDisabler *)NULL;
- SetBackgroundColour(wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
}
bool wxDialog::Create(wxWindow *parent,
}
bool wxDialog::Create(wxWindow *parent,
@@
-122,7
+122,7
@@
bool wxDialog::Create(wxWindow *parent,
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE;
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE;
- SetFont(wxSystemSettings::Get
System
Font(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE;
}
return TRUE;
}
@@
-389,7
+389,7
@@
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
#if wxUSE_CTL3D
Ctl3dColorChange();
#else
#if wxUSE_CTL3D
Ctl3dColorChange();
#else
- SetBackgroundColour(wxSystemSettings::Get
System
Colour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
#endif
}
Refresh();
#endif
}