projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use GetFont not m_font for GetCharHeight
[wxWidgets.git]
/
src
/
common
/
appcmn.cpp
diff --git
a/src/common/appcmn.cpp
b/src/common/appcmn.cpp
index 43bd65360c435fb67795c90a7916f45ae2f77108..f4ec68fde9a9d7c353d7b6ae012b52d2f8916119 100644
(file)
--- a/
src/common/appcmn.cpp
+++ b/
src/common/appcmn.cpp
@@
-17,10
+17,6
@@
// headers
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "appbase.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-47,8
+43,8
@@
#include "wx/utils.h"
#include "wx/ptr_scpd.h"
#include "wx/utils.h"
#include "wx/ptr_scpd.h"
-#if defined(__WXMSW__)
&& !defined(__PALMOS__)
- #include "wx/msw/private.h" // includes windows.h for LOGFONT
+#if defined(__WXMSW__)
+
#include "wx/msw/private.h" // includes windows.h for LOGFONT
#endif
#if wxUSE_FONTMAP
#endif
#if wxUSE_FONTMAP
@@
-65,7
+61,7
@@
WX_CHECK_BUILD_OPTIONS("wxCore")
// ----------------------------------------------------------------------------
// this defines wxEventLoopPtr
// ----------------------------------------------------------------------------
// this defines wxEventLoopPtr
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
;
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
// ============================================================================
// wxAppBase implementation
// ============================================================================
// wxAppBase implementation
@@
-100,9
+96,9
@@
wxAppBase::wxAppBase()
m_exitOnFrameDelete = Later;
}
m_exitOnFrameDelete = Later;
}
-bool wxAppBase::Initialize(int& argc
, wxChar **argv
)
+bool wxAppBase::Initialize(int& argc
Orig, wxChar **argvOrig
)
{
{
- if ( !wxAppConsole::Initialize(argc
, argv
) )
+ if ( !wxAppConsole::Initialize(argc
Orig, argvOrig
) )
return false;
#if wxUSE_THREADS
return false;
#if wxUSE_THREADS
@@
-184,7
+180,7
@@
void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
#ifdef __WXUNIVERSAL__
{
wxCMD_LINE_OPTION,
#ifdef __WXUNIVERSAL__
{
wxCMD_LINE_OPTION,
-
_T("")
,
+
wxEmptyString
,
OPTION_THEME,
gettext_noop("specify the theme to use"),
wxCMD_LINE_VAL_STRING,
OPTION_THEME,
gettext_noop("specify the theme to use"),
wxCMD_LINE_VAL_STRING,
@@
-198,7
+194,7
@@
void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
// and not mgl/app.cpp
{
wxCMD_LINE_OPTION,
// and not mgl/app.cpp
{
wxCMD_LINE_OPTION,
-
_T("")
,
+
wxEmptyString
,
OPTION_MODE,
gettext_noop("specify display mode to use (e.g. 640x480-16)"),
wxCMD_LINE_VAL_STRING,
OPTION_MODE,
gettext_noop("specify display mode to use (e.g. 640x480-16)"),
wxCMD_LINE_VAL_STRING,
@@
-209,9
+205,9
@@
void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
// terminator
{
wxCMD_LINE_NONE,
// terminator
{
wxCMD_LINE_NONE,
-
_T("")
,
-
_T("")
,
-
_T("")
,
+
wxEmptyString
,
+
wxEmptyString
,
+
wxEmptyString
,
wxCMD_LINE_VAL_NONE,
0x0
}
wxCMD_LINE_VAL_NONE,
0x0
}
@@
-478,7
+474,7
@@
wxLog *wxGUIAppTraitsBase::CreateLogTarget()
#if wxUSE_LOGGUI
return new wxLogGui;
#else
#if wxUSE_LOGGUI
return new wxLogGui;
#else
- // we
m
ust have something!
+ // we
m
ust have something!
return new wxLogStderr;
#endif
}
return new wxLogStderr;
#endif
}
@@
-580,10
+576,10
@@
void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
#if wxUSE_SOCKETS
#if wxUSE_SOCKETS
-#if defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
- #include "wx/unix/gsockunx.h"
-#elif defined(__WINDOWS__)
+#if defined(__WINDOWS__)
#include "wx/msw/gsockmsw.h"
#include "wx/msw/gsockmsw.h"
+#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
+ #include "wx/unix/gsockunx.h"
#elif defined(__WXMAC__)
#include <MacHeaders.c>
#define OTUNIXERRORS 1
#elif defined(__WXMAC__)
#include <MacHeaders.c>
#define OTUNIXERRORS 1