Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added m_ prefix to wxColourData and wxFontData members for consistency.

Browse Source 
Fixed some typos in comments.
Fixed wizard constructor doc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-26 13:15:12 +00:00
parent 22c2307c2b
commit ae500232a4
18 changed files with 124 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/generic/fontdlgg.cpp
View File

@@ -204,7 +204,7 @@ int wxGenericFontDialog::ShowModal()
if (ret != wxID_CANCEL)
{
m_fontData.chosenFont = dialogFont;
m_fontData.m_chosenFont = dialogFont;
}
return ret;
@@ -257,7 +257,7 @@ void wxGenericFontDialog::CreateWidgets()
familyChoice->SetStringSelection( wxFontFamilyIntToString(dialogFont.GetFamily()) );
styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle()));
weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight()));
wxString name(wxTheColourDatabase->FindName(m_fontData.fontColour));
wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour()));
colourChoice->SetStringSelection(name);
underLineCheckBox->SetValue(dialogFont.GetUnderlined());
@@ -310,13 +310,13 @@ void wxGenericFontDialog::InitializeFont()
int fontSize = 12;
int fontUnderline = FALSE;
if (m_fontData.initialFont.Ok())
if (m_fontData.m_initialFont.Ok())
{
fontFamily = m_fontData.initialFont.GetFamily();
fontWeight = m_fontData.initialFont.GetWeight();
fontStyle = m_fontData.initialFont.GetStyle();
fontSize = m_fontData.initialFont.GetPointSize();
fontUnderline = m_fontData.initialFont.GetUnderlined();
fontFamily = m_fontData.m_initialFont.GetFamily();
fontWeight = m_fontData.m_initialFont.GetWeight();
fontStyle = m_fontData.m_initialFont.GetStyle();
fontSize = m_fontData.m_initialFont.GetPointSize();
fontUnderline = m_fontData.m_initialFont.GetUnderlined();
}
dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));
@@ -346,7 +346,7 @@ void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
col = wxTheColourDatabase->FindColour(colourChoice->GetStringSelection());
if (col)
{
m_fontData.fontColour = *col;
m_fontData.m_fontColour = *col;
m_previewer->SetForegroundColour(*col);
}
}