projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxHtmlLinkInfo::GetHtmlCell so that you know where it came from
[wxWidgets.git]
/
src
/
os2
/
utils.cpp
diff --git
a/src/os2/utils.cpp
b/src/os2/utils.cpp
index 9c2ea76d18b71d52fbdb716078e620581abb2034..a5dd628bad4d7f74a707b73edc0dd8fd37e596c4 100644
(file)
--- a/
src/os2/utils.cpp
+++ b/
src/os2/utils.cpp
@@
-65,9
+65,9
@@
bool wxGetHostName(
char zServer[256];
char zComputer[256];
unsigned long ulLevel = 0;
char zServer[256];
char zComputer[256];
unsigned long ulLevel = 0;
- unsigned char* zBuffer;
- unsigned long ulBuffer;
- unsigned long* pulTotalAvail;
+ unsigned char* zBuffer
= NULL
;
+ unsigned long ulBuffer
= 256
;
+ unsigned long* pulTotalAvail
= NULL
;
NetBios32GetInfo( (const unsigned char*)zServer
,(const unsigned char*)zComputer
NetBios32GetInfo( (const unsigned char*)zServer
,(const unsigned char*)zComputer
@@
-197,7
+197,7
@@
bool wxShell(
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
{
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
{
- void* pMemptr;
+ void* pMemptr
= NULL
;
ULONG lSize;
ULONG lMemFlags;
APIRET rc;
ULONG lSize;
ULONG lMemFlags;
APIRET rc;
@@
-336,8
+336,8
@@
bool wxWriteResource(
, const wxString& rFile
)
{
, const wxString& rFile
)
{
- HAB hab;
- HINI hIni;
+ HAB hab
= 0
;
+ HINI hIni
= 0
;
if (rFile != "")
{
if (rFile != "")
{
@@
-418,8
+418,8
@@
bool wxGetResource(
, const wxString& rFile
)
{
, const wxString& rFile
)
{
- HAB hab;
- HINI hIni;
+ HAB hab
= 0
;
+ HINI hIni
= 0
;
wxChar zDefunkt[] = _T("$$default");
char zBuf[1000];
wxChar zDefunkt[] = _T("$$default");
char zBuf[1000];
@@
-669,8
+669,8
@@
bool wxCheckForInterrupt(
if(pWnd)
{
QMSG vMsg;
if(pWnd)
{
QMSG vMsg;
- HAB hab;
- HWND hwndFilter;
+ HAB hab
= 0
;
+ HWND hwndFilter
= NULLHANDLE
;
HWND hwndWin= (HWND) pWnd->GetHWND();
while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
HWND hwndWin= (HWND) pWnd->GetHWND();
while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
@@
-738,12
+738,16
@@
void wxDisplaySize(
{
HPS hpsScreen;
HDC hdcScreen;
{
HPS hpsScreen;
HDC hdcScreen;
+ LONG lWidth;
+ LONG lHeight;
hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
hdcScreen = ::GpiQueryDevice(hpsScreen);
hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
hdcScreen = ::GpiQueryDevice(hpsScreen);
- ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L,
(PLONG)p
Width);
- ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L,
(PLONG)p
Height);
+ ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L,
&l
Width);
+ ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L,
&l
Height);
DevCloseDC(hdcScreen);
DevCloseDC(hdcScreen);
+ *pWidth = (int)lWidth;
+ *pHeight = (int)lHeight;
}
bool wxDirExists(
}
bool wxDirExists(