projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store a pointer to each ClassFactory so we can correctly release it when the browser...
[wxWidgets.git]
/
src
/
msw
/
fontdlg.cpp
diff --git
a/src/msw/fontdlg.cpp
b/src/msw/fontdlg.cpp
index 7011de08ea23c9e78ea90aebc8c29f328f3e3123..96c3289a6d7c925c19aa2f0bda44ad54aaad4a37 100644
(file)
--- a/
src/msw/fontdlg.cpp
+++ b/
src/msw/fontdlg.cpp
@@
-26,18
+26,16
@@
#if wxUSE_FONTDLG
#if wxUSE_FONTDLG
+#include "wx/fontdlg.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcdlg.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/log.h"
+ #include "wx/math.h"
#endif
#endif
-#include "wx/fontdlg.h"
-#include "wx/msw/wrapcdlg.h"
-
-#include "wx/cmndata.h"
-#include "wx/math.h"
-
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-70,13
+68,13
@@
int wxFontDialog::ShowModal()
chooseFontStruct.hwndOwner = GetHwndOf(m_parent);
chooseFontStruct.lpLogFont = &logFont;
chooseFontStruct.hwndOwner = GetHwndOf(m_parent);
chooseFontStruct.lpLogFont = &logFont;
- if ( m_fontData.m_initialFont.Ok() )
+ if ( m_fontData.m_initialFont.
Is
Ok() )
{
flags |= CF_INITTOLOGFONTSTRUCT;
wxFillLogFont(&logFont, &m_fontData.m_initialFont);
}
{
flags |= CF_INITTOLOGFONTSTRUCT;
wxFillLogFont(&logFont, &m_fontData.m_initialFont);
}
- if ( m_fontData.m_fontColour.Ok() )
+ if ( m_fontData.m_fontColour.
Is
Ok() )
{
chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);
}
{
chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);
}
@@
-113,17
+111,12
@@
int wxFontDialog::ShowModal()
}
else
{
}
else
{
- // common dialog failed - why?
-#ifdef __WXDEBUG__
DWORD dwErr = CommDlgExtendedError();
if ( dwErr != 0 )
{
DWORD dwErr = CommDlgExtendedError();
if ( dwErr != 0 )
{
- // this msg is only for developers
- wxLogError(wxT("Common dialog failed with error code %0lx."),
- dwErr);
+ wxLogError(_("Common dialog failed with error code %0lx."), dwErr);
}
//else: it was just cancelled
}
//else: it was just cancelled
-#endif
return wxID_CANCEL;
}
return wxID_CANCEL;
}