#ifdef __GNUG__
// Note: this is done in utilscmn.cpp now.
-// #pragma implementation
// #pragma implementation "utils.h"
#endif
#include <string.h>
#include <stdarg.h>
+#ifdef __DARWIN__
+# include "MoreFilesX.h"
+#else
+# include "MoreFiles.h"
+# include "MoreFilesExtras.h"
+#endif
+
#ifndef __DARWIN__
- #include "MoreFiles.h"
- #include "MoreFilesExtras.h"
+#include <Threads.h>
+#include <Sound.h>
#endif
#ifndef __DARWIN__
return TRUE;
}
-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig , wxKillError *rc )
{
// TODO
return 0;
}
+WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
+{
+ // TODO : under classic there is no environement support, under X yes
+ return false ;
+}
+
+// set the env var name to the given value, return TRUE on success
+WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
+{
+ // TODO : under classic there is no environement support, under X yes
+ return false ;
+}
+
//
// Execute a program in an Interactive Shell
//
return FALSE;
}
+// Shutdown or reboot the PC
+bool wxShutdown(wxShutdownFlags wFlags)
+{
+ // TODO
+ return FALSE;
+}
+
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
{
void wxUsleep(unsigned long milliseconds)
{
- clock_t start = clock() ;
- do
- {
- YieldToAnyThread() ;
- } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
+ clock_t start = clock() ;
+ do
+ {
+ YieldToAnyThread() ;
+ } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
}
void wxSleep(int nSecs)
{
}
+#if WXWIN_COMPATIBILITY_2_2
+
// Output a debug message, in a system dependent fashion.
void wxDebugMsg(const char *fmt ...)
{
wxMessageBox(wxBuffer);
wxExit();
}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
#endif // !__DARWIN__
// Emit a beeeeeep
int wxGetOsVersion(int *majorVsn, int *minorVsn)
{
- long theSystem ;
- Gestalt(gestaltSystemVersion, &theSystem) ;
- *minorVsn = (theSystem & 0xFF ) ;
- *majorVsn = (theSystem >> 8 ) ; // are there x-platform conventions ?
- return wxMACINTOSH;
+ long theSystem ;
+
+ // are there x-platform conventions ?
+
+ Gestalt(gestaltSystemVersion, &theSystem) ;
+ if (minorVsn != NULL) {
+ *minorVsn = (theSystem & 0xFF ) ;
+ }
+ if (majorVsn != NULL) {
+ *majorVsn = (theSystem >> 8 ) ;
+ }
+#ifdef __DARWIN__
+ return wxMAC_DARWIN;
+#else
+ return wxMAC;
+#endif
}
// Reading and writing resources (eg WIN.INI, .Xdefaults)
}
#endif // wxUSE_RESOURCES
-int wxBusyCursorCount = 0;
-extern CursHandle gMacCurrentCursor ;
-CursHandle gMacStoredActiveCursor = NULL ;
+int gs_wxBusyCursorCount = 0;
+extern wxCursor gMacCurrentCursor ;
+wxCursor gMacStoredActiveCursor ;
// Set the cursor to the busy cursor for all windows
void wxBeginBusyCursor(wxCursor *cursor)
{
- wxBusyCursorCount ++;
- if (wxBusyCursorCount == 1)
+ if (gs_wxBusyCursorCount++ == 0)
{
gMacStoredActiveCursor = gMacCurrentCursor ;
- ::SetCursor( *::GetCursor( watchCursor ) ) ;
- }
- else
- {
- // TODO
+ cursor->MacInstall() ;
}
+ //else: nothing to do, already set
}
// Restore cursor to normal
void wxEndBusyCursor()
{
- if (wxBusyCursorCount == 0)
- return;
+ wxCHECK_RET( gs_wxBusyCursorCount > 0,
+ wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );
- wxBusyCursorCount --;
- if (wxBusyCursorCount == 0)
+ if (--gs_wxBusyCursorCount == 0)
{
- if ( gMacStoredActiveCursor )
- ::SetCursor( *gMacStoredActiveCursor ) ;
- else
- {
- Cursor MacArrow ;
- ::SetCursor( GetQDGlobalsArrow( &MacArrow ) ) ;
- }
- gMacStoredActiveCursor = NULL ;
+ gMacStoredActiveCursor.MacInstall() ;
+ gMacStoredActiveCursor = wxNullCursor ;
}
}
// TRUE if we're between the above two calls
bool wxIsBusy()
{
- return (wxBusyCursorCount > 0);
+ return (gs_wxBusyCursorCount > 0);
}
-#ifndef __DARWIN__
-wxString wxMacFindFolder( short vol,
- OSType folderType,
- Boolean createFolder)
+wxString wxMacFindFolder( short vol,
+ OSType folderType,
+ Boolean createFolder)
{
- short vRefNum ;
- long dirID ;
- wxString strDir ;
-
- if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
- {
- FSSpec file ;
- if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
- {
- strDir = wxMacFSSpec2MacFilename( &file ) + ":" ;
- }
- }
- return strDir ;
+ short vRefNum ;
+ long dirID ;
+ wxString strDir ;
+
+ if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
+ {
+ FSSpec file ;
+ if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
+ {
+ strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
+ }
+ }
+ return strDir ;
}
-#endif
#ifndef __DARWIN__
char *wxGetUserHome (const wxString& user)
// TODO
return NULL;
}
-#endif
-#ifndef __DARWIN__
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{
if ( path.empty() )
// Get size of display
void wxDisplaySize(int *width, int *height)
{
- BitMap screenBits;
- GetQDGlobalsScreenBits( &screenBits );
+ BitMap screenBits;
+ GetQDGlobalsScreenBits( &screenBits );
*width = screenBits.bounds.right - screenBits.bounds.left ;
*height = screenBits.bounds.bottom - screenBits.bounds.top ;
-#if TARGET_CARBON
- SInt16 mheight ;
- GetThemeMenuBarHeight( &mheight ) ;
- *height -= mheight ;
-#else
- *height -= LMGetMBarHeight() ;
-#endif
}
void wxDisplaySizeMM(int *width, int *height)
{
- wxDisplaySize(width, height);
+ wxDisplaySize(width, height);
+ // on mac 72 is fixed (at least now ;-)
+ float cvPt2Mm = 25.4 / 72;
+ *width = int( *width * cvPt2Mm );
+ *height = int( *height * cvPt2Mm );
}
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{
- // This is supposed to return desktop dimensions minus any window
- // manager panels, menus, taskbars, etc. If there is a way to do that
- // for this platform please fix this function, otherwise it defaults
- // to the entire desktop.
+ BitMap screenBits;
+ GetQDGlobalsScreenBits( &screenBits );
+
if (x) *x = 0;
if (y) *y = 0;
- wxDisplaySize(width, height);
+
+ *width = screenBits.bounds.right - screenBits.bounds.left ;
+ *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+
+ SInt16 mheight ;
+#if TARGET_CARBON
+ GetThemeMenuBarHeight( &mheight ) ;
+#else
+ mheight = LMGetMBarHeight() ;
+#endif
+ *height -= mheight ;
+ if ( y )
+ *y = mheight ;
}
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
{
return wxGenericFindWindowAtPoint(pt);
}
+
+wxString wxGetOsDescription()
+{
+#ifdef WXWIN_OS_DESCRIPTION
+ // use configure generated description if available
+ return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+#else
+ return "MacOS" ; //TODO:define further
+#endif
+}
+
+//---------------------------------------------------------------------------
+// wxMac Specific utility functions
+//---------------------------------------------------------------------------
+
+#if TARGET_CARBON
+// converts this string into a carbon foundation string with optional pc 2 mac encoding
+CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding )
+{
+ return CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
+ pc2macEncoding ?
+ kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
+}
+
+#endif //TARGET_CARBON
+
projects / wxWidgets.git / blobdiff