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

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-10-20 04:42:32 +00:00
parent ac0ac8241f
commit 78d50441dd
2 changed files with 90 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/os2/makefile.va
View File

@@ -770,16 +770,16 @@ $(WXDIR)\lib\wx.lib: \
!else !else
# Update the import library # Update the import library
$(WXDIR)\lib\wx200.lib: $(OBJECTS) $(WXDIR)\lib\wx210.lib: $(OBJECTS)
implib $(WXDIR)\lib\wx200.lib $(WXDIR)\lib\wx200.def implib $(WXDIR)\lib\wx210.lib $(WXDIR)\lib\wx210.def
# Update the dynamic link library # Update the dynamic link library
$(WXDIR)\lib\wx200.dll: $(OBJECTS) $(WXDIR)\lib\wx200.lib $(WXDIR)\lib\wx200.dll: $(OBJECTS) $(WXDIR)\lib\wx210.lib
icc @<< icc @<<
/B" $(LINKFLAGS)" /Fe$@ /B" $(LINKFLAGS)" /Fe$@
$(LIBS) $(LIBS)
$(OBJECTS) $(OBJECTS)
$(WXDIR)\lib\wx200.def $(WXDIR)\lib\wx210.def
<< <<
!endif !endif

147
src/os2/utils.cpp
View File

@@ -131,10 +131,17 @@ bool wxShell(const wxString& command)
} }
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory() long wxGetFreeMemory(void *memptr)
{ {
// return (long)GetFreeSpace(0); ULONG lSize;
return 0L; ULONG lMemFlags;
APIRET rc;
lMemFlags = PAG_FREE;
rc = ::DosQueryMem(memptr, &lSize, &lMemFlags);
if (rc != 0)
return -1L;
return (long)lSize;
} }
// Sleep for nSecs seconds. Attempt a Windows implementation using timers. // Sleep for nSecs seconds. Attempt a Windows implementation using timers.
@@ -159,19 +166,7 @@ void wxUsleep(unsigned long milliseconds)
void wxSleep(int nSecs) void wxSleep(int nSecs)
{ {
if (inTimer) ::DosSleep( 1000*nSecs );
return;
wxTheSleepTimer = new wxSleepTimer;
inTimer = TRUE;
wxTheSleepTimer->Start(nSecs*1000);
while (inTimer)
{
if (wxTheApp->Pending())
wxTheApp->Dispatch();
}
delete wxTheSleepTimer;
wxTheSleepTimer = NULL;
} }
// Consume all events until no more left // Consume all events until no more left
@@ -256,61 +251,91 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
#if wxUSE_RESOURCES #if wxUSE_RESOURCES
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file) bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
{ {
// TODO: HAB hab;
/* HINI hIni;
if (file != "")
return (WritePrivateProfileString((PCSZ)WXSTRINGCAST section, (PCSZ)WXSTRINGCAST entry, (PCSZ)value, (PCSZ)WXSTRINGCAST file) != 0); if (file != "")
else {
return (WriteProfileString((PCSZ)WXSTRINGCAST section, (PCSZ)WXSTRINGCAST entry, (PCSZ)WXSTRINGCAST value) != 0); hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST file);
*/ if (hIni != 0L)
{
return (::PrfWriteProfileString( hIni
,(PSZ)WXSTRINGCAST section
,(PSZ)WXSTRINGCAST entry
,(PSZ)WXSTRINGCAST value
));
}
}
else
return (::PrfWriteProfileString( HINI_PROFILE
,(PSZ)WXSTRINGCAST section
,(PSZ)WXSTRINGCAST entry
,(PSZ)WXSTRINGCAST value
));
return FALSE; return FALSE;
} }
bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file) bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
{ {
wxChar buf[50]; wxChar buf[50];
wxSprintf(buf, "%.4f", value); wxSprintf(buf, "%.4f", value);
return wxWriteResource(section, entry, buf, file); return wxWriteResource(section, entry, buf, file);
} }
bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file) bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
{ {
wxChar buf[50]; wxChar buf[50];
wxSprintf(buf, "%ld", value); wxSprintf(buf, "%ld", value);
return wxWriteResource(section, entry, buf, file); return wxWriteResource(section, entry, buf, file);
} }
bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file) bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
{ {
wxChar buf[50]; wxChar buf[50];
wxSprintf(buf, "%d", value); wxSprintf(buf, "%d", value);
return wxWriteResource(section, entry, buf, file); return wxWriteResource(section, entry, buf, file);
} }
bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file) bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file)
{ {
static const wxChar defunkt[] = _T("$$default"); HAB hab;
// TODO: HINI hIni;
/* static const wxChar defunkt[] = _T("$$default");
if (file != "")
{ if (file != "")
int n = GetPrivateProfileString((PCSZ)WXSTRINGCAST section, (PCSZ)WXSTRINGCAST entry, (PCSZ)defunkt, {
(PSZ)wxBuffer, 1000, (PCSZ)WXSTRINGCAST file); hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST file);
if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0) if (hIni != 0L)
return FALSE; {
} ULONG n = ::PrfQueryProfileString( hIni
else ,(PSZ)WXSTRINGCAST section
{ ,(PSZ)WXSTRINGCAST entry
int n = GetProfileString((PCSZ)WXSTRINGCAST section, (PCSZ)WXSTRINGCAST entry, (LPCTSTR)defunkt, ,(PSZ)defunkt
(PSZ)wxBuffer, 1000); ,(void*)wxBuffer
if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0) ,1000
return FALSE; );
} if (n == 0L || wxStrcmp(wxBuffer, defunkt) == 0)
if (*value) delete[] (*value); return FALSE;
*value = copystring(wxBuffer); }
return TRUE; else
*/ return FALSE;
return FALSE; }
else
{
ULONG n = ::PrfQueryProfileString( HINI_PROFILE
,(PSZ)WXSTRINGCAST section
,(PSZ)WXSTRINGCAST entry
,(PSZ)defunkt
,(void*)wxBuffer
,1000
);
if (n == 0L || wxStrcmp(wxBuffer, defunkt) == 0)
return FALSE;
}
if (*value)
delete[] (*value);
*value = copystring(wxBuffer);
return TRUE;
} }
bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file) bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
@@ -499,18 +524,18 @@ wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourc
void wxGetMousePosition( int* x, int* y ) void wxGetMousePosition( int* x, int* y )
{ {
POINTL pt; POINTL pt;
::WinQueryPointerPos( HWND_DESKTOP, & pt ); ::WinQueryPointerPos( HWND_DESKTOP, & pt );
*x = pt.x; *x = pt.x;
*y = pt.y; *y = pt.y;
}; };
// Return TRUE if we have a colour display // Return TRUE if we have a colour display
bool wxColourDisplay() bool wxColourDisplay()
{ {
bool flag; bool flag;
// TODO: use DosQueryDevCaps to figure it out // TODO: use DosQueryDevCaps to figure it out
return flag; return flag;
} }
// Returns depth of screen // Returns depth of screen