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

Fixed various wxMSW compile problems that came down the telephone line...

Browse Source 
plus wxTreeCtrl::EditLabel/EndEditLabel, dialog editor stuff, wxMSW header changes,
doc changes. Sorry about the quantity :-(


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-07 23:52:45 +00:00
parent c2d8daeb4a
commit bbcdf8bc7c
110 changed files with 1009 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/msw/fontdlg.cpp
View File

@@ -56,7 +56,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
wxFontDialog::wxFontDialog(void)
{
dialogParent = NULL;
m_dialogParent = NULL;
}
wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
@@ -66,10 +66,10 @@ wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
{
dialogParent = parent;
m_dialogParent = parent;
if (data)
fontData = *data;
m_fontData = *data;
return TRUE;
}
@@ -83,28 +83,28 @@ int wxFontDialog::ShowModal(void)
memset(&chooseFontStruct, 0, sizeof(CHOOSEFONT));
chooseFontStruct.lStructSize = sizeof(CHOOSEFONT);
chooseFontStruct.hwndOwner = (HWND) (dialogParent ? (HWND) dialogParent->GetHWND() : NULL);
chooseFontStruct.hwndOwner = (HWND) (m_dialogParent ? (HWND) m_dialogParent->GetHWND() : NULL);
chooseFontStruct.lpLogFont = &logFont;
if (fontData.initialFont.Ok())
if (m_fontData.initialFont.Ok())
{
flags |= CF_INITTOLOGFONTSTRUCT;
wxFillLogFont(&logFont, & fontData.initialFont);
wxFillLogFont(&logFont, & m_fontData.initialFont);
}
chooseFontStruct.iPointSize = 0;
chooseFontStruct.rgbColors = RGB((BYTE)fontData.fontColour.Red(), (BYTE)fontData.fontColour.Green(), (BYTE)fontData.fontColour.Blue());
chooseFontStruct.rgbColors = RGB((BYTE)m_fontData.fontColour.Red(), (BYTE)m_fontData.fontColour.Green(), (BYTE)m_fontData.fontColour.Blue());
if (!fontData.GetAllowSymbols())
if (!m_fontData.GetAllowSymbols())
flags |= CF_ANSIONLY;
if (fontData.GetEnableEffects())
if (m_fontData.GetEnableEffects())
flags |= CF_EFFECTS;
if (fontData.GetShowHelp())
if (m_fontData.GetShowHelp())
flags |= CF_SHOWHELP;
if (!(fontData.minSize == 0 && fontData.maxSize == 0))
if (!(m_fontData.minSize == 0 && m_fontData.maxSize == 0))
{
chooseFontStruct.nSizeMin = fontData.minSize;
chooseFontStruct.nSizeMax = fontData.maxSize;
chooseFontStruct.nSizeMin = m_fontData.minSize;
chooseFontStruct.nSizeMax = m_fontData.maxSize;
flags |= CF_LIMITSIZE;
}
@@ -115,9 +115,9 @@ int wxFontDialog::ShowModal(void)
// Restore values
if (success)
{
fontData.fontColour.Set(GetRValue(chooseFontStruct.rgbColors), GetGValue(chooseFontStruct.rgbColors),
m_fontData.fontColour.Set(GetRValue(chooseFontStruct.rgbColors), GetGValue(chooseFontStruct.rgbColors),
GetBValue(chooseFontStruct.rgbColors));
fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
m_fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
}
return success ? wxID_OK : wxID_CANCEL;