projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo fix
[wxWidgets.git]
/
src
/
os2
/
utils.cpp
diff --git
a/src/os2/utils.cpp
b/src/os2/utils.cpp
index 816ed527eb14a369c9e7b8aec3a627a702415352..5ac046f10a676010e9ed48875589bfb90594b303 100644
(file)
--- a/
src/os2/utils.cpp
+++ b/
src/os2/utils.cpp
@@
-291,6
+291,8
@@
void wxFlushEvents()
// wxYield();
}
// wxYield();
}
+#if WXWIN_COMPATIBILITY_2_2
+
// Output a debug mess., in a system dependent fashion.
void wxDebugMsg(
const wxChar* zFmt ...
// Output a debug mess., in a system dependent fashion.
void wxDebugMsg(
const wxChar* zFmt ...
@@
-343,6
+345,8
@@
void wxFatalError(
DosExit(EXIT_PROCESS, ulRc);
}
DosExit(EXIT_PROCESS, ulRc);
}
+#endif // WXWIN_COMPATIBILITY_2_2
+
// Emit a beeeeeep
void wxBell()
{
// Emit a beeeeeep
void wxBell()
{
@@
-1218,6
+1222,7
@@
void wxOS2SetFont(
char zStyle[30];
if (hWnd == NULLHANDLE)
char zStyle[30];
if (hWnd == NULLHANDLE)
+ return;
//
// The fonts available for Presentation Params are just three
//
// The fonts available for Presentation Params are just three
@@
-1227,20
+1232,29
@@
void wxOS2SetFont(
switch(rFont.GetFamily())
{
case wxSCRIPT:
switch(rFont.GetFamily())
{
case wxSCRIPT:
+ strcpy(zFacename, "Script");
+ break;
+
case wxDECORATIVE:
case wxROMAN:
case wxDECORATIVE:
case wxROMAN:
- strcpy(zFacename,"T
imes New Roma
n");
+ strcpy(zFacename,"T
ms Rm
n");
break;
case wxTELETYPE:
break;
case wxTELETYPE:
- case wxMODERN:
strcpy(zFacename, "Courier");
break;
strcpy(zFacename, "Courier");
break;
+ case wxMODERN:
+ strcpy(zFacename, "System VIO");
+ break;
+
case wxSWISS:
case wxSWISS:
+ strcpy(zFacename, "Helv");
+ break;
+
case wxDEFAULT:
default:
case wxDEFAULT:
default:
- strcpy(zFacename, "
Helvetica
");
+ strcpy(zFacename, "
System VIO
");
break;
}
break;
}