// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
// Note: this is done in utilscmn.cpp now.
// #pragma implementation "utils.h"
#endif
-#include "wx/setup.h"
+#include "wx/wxprec.h"
+
#include "wx/utils.h"
#include "wx/app.h"
-#include "wx/mac/uma.h"
+#include "wx/apptrait.h"
+
+#if wxUSE_GUI
+ #include "wx/mac/uma.h"
+ #include "wx/font.h"
+#else
+ #include "wx/intl.h"
+#endif
#include <ctype.h>
#include <string.h>
#include <stdarg.h>
-#ifdef __DARWIN__
-# include "MoreFilesX.h"
-#else
-# include "MoreFiles.h"
-# include "MoreFilesExtras.h"
-#endif
+#include "MoreFilesX.h"
#ifndef __DARWIN__
#include <Threads.h>
#include <Sound.h>
#endif
+#if wxUSE_GUI
+#if TARGET_API_MAC_OSX
+#include <CoreServices/CoreServices.h>
+#else
+#include <DriverServices.h>
+#include <Multiprocessing.h>
+#endif
+
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
+#endif // wxUSE_GUI
+
+#include "wx/mac/private.h" // includes mac headers
+
+#if defined(__MWERKS__) && wxUSE_UNICODE
+ #include <wtime.h>
+#endif
+
+// ---------------------------------------------------------------------------
+// code used in both base and GUI compilation
+// ---------------------------------------------------------------------------
+
+// our OS version is the same in non GUI and GUI cases
+static int DoGetOSVersion(int *majorVsn, int *minorVsn)
+{
+ 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
+}
+
+
+#if wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// debugging support
+// ----------------------------------------------------------------------------
+
+#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+
+// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
+
+#ifndef __MetroNubUtils__
+#include "MetroNubUtils.h"
+#endif
+
+#ifndef __GESTALT__
+#include <Gestalt.h>
+#endif
+
+#if TARGET_API_MAC_CARBON
+
+ #include <CodeFragments.h>
+
+ extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+
+ ProcPtr gCallUniversalProc_Proc = NULL;
+
+#endif
+
+static MetroNubUserEntryBlock* gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+/* ---------------------------------------------------------------------------
+ IsMetroNubInstalled
+ --------------------------------------------------------------------------- */
+
+Boolean IsMetroNubInstalled()
+{
+ if (!fRunOnce)
+ {
+ long result, value;
+
+ fRunOnce = true;
+ gMetroNubEntry = NULL;
+
+ if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
+ {
+ /* look for MetroNub's Gestalt selector */
+ if (Gestalt(kMetroNubUserSignature, &result) == noErr)
+ {
+
+ #if TARGET_API_MAC_CARBON
+ if (gCallUniversalProc_Proc == NULL)
+ {
+ CFragConnectionID connectionID;
+ Ptr mainAddress;
+ Str255 errorString;
+ ProcPtr symbolAddress;
+ OSErr err;
+ CFragSymbolClass symbolClass;
+
+ symbolAddress = NULL;
+ err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag,
+ &connectionID, &mainAddress, errorString);
+
+ if (err != noErr)
+ {
+ gCallUniversalProc_Proc = NULL;
+ goto end;
+ }
+
+ err = FindSymbol(connectionID, "\pCallUniversalProc",
+ (Ptr *) &gCallUniversalProc_Proc, &symbolClass);
+
+ if (err != noErr)
+ {
+ gCallUniversalProc_Proc = NULL;
+ goto end;
+ }
+ }
+ #endif
+
+ {
+ MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+
+ /* make sure the version of the API is compatible */
+ if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
+ kMetroNubUserAPIVersion <= block->apiHiVersion)
+ gMetroNubEntry = block; /* success! */
+ }
+
+ }
+ }
+ }
+
+end:
+
+#if TARGET_API_MAC_CARBON
+ return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+#else
+ return (gMetroNubEntry != NULL);
+#endif
+}
+
+/* ---------------------------------------------------------------------------
+ IsMWDebuggerRunning [v1 API]
+ --------------------------------------------------------------------------- */
+
+Boolean IsMWDebuggerRunning()
+{
+ if (IsMetroNubInstalled())
+ return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+ else
+ return false;
+}
+
+/* ---------------------------------------------------------------------------
+ AmIBeingMWDebugged [v1 API]
+ --------------------------------------------------------------------------- */
+
+Boolean AmIBeingMWDebugged()
+{
+ if (IsMetroNubInstalled())
+ return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+ else
+ return false;
+}
+
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+ return IsMWDebuggerRunning() && AmIBeingMWDebugged();
+}
+
+#else
+
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+ return false;
+}
+
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
+
+
#ifndef __DARWIN__
// defined in unix/utilsunx.cpp for Mac OS X
}
// Get hostname only (without domain name)
-bool wxGetHostName(char *buf, int maxSize)
+bool wxGetHostName(wxChar *buf, int maxSize)
{
- // Gets Chooser name of user by examining a System resource.
+ // Gets Chooser name of user by examining a System resource.
- const short kComputerNameID = -16413;
-
- short oldResFile = CurResFile() ;
- UseResFile(0);
- StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);
- UseResFile(oldResFile);
+ const short kComputerNameID = -16413;
- if (chooserName && *chooserName)
- {
- int length = (*chooserName)[0] ;
- if ( length + 1 > maxSize )
- {
- length = maxSize - 1 ;
- }
- strncpy( buf , (char*) &(*chooserName)[1] , length ) ;
- buf[length] = 0 ;
- }
- else
- buf[0] = 0 ;
+ short oldResFile = CurResFile() ;
+ UseResFile(0);
+ StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);
+ UseResFile(oldResFile);
- return TRUE;
+ if (chooserName && *chooserName)
+ {
+ HLock( (Handle) chooserName ) ;
+ wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
+ HUnlock( (Handle) chooserName ) ;
+ ReleaseResource( (Handle) chooserName ) ;
+ wxStrncpy( buf , name , maxSize - 1 ) ;
+ }
+ else
+ buf[0] = 0 ;
+
+ return true;
}
// Get user ID e.g. jacs
-bool wxGetUserId(char *buf, int maxSize)
+bool wxGetUserId(wxChar *buf, int maxSize)
{
return wxGetUserName( buf , maxSize ) ;
}
const wxChar* wxGetHomeDir(wxString *pstr)
{
- *pstr = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
- return pstr->c_str() ;
+ *pstr = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
+ return pstr->c_str() ;
}
// Get user name e.g. Stefan Csomor
-bool wxGetUserName(char *buf, int maxSize)
+bool wxGetUserName(wxChar *buf, int maxSize)
{
- // Gets Chooser name of user by examining a System resource.
+ // Gets Chooser name of user by examining a System resource.
+
+ const short kChooserNameID = -16096;
- const short kChooserNameID = -16096;
-
- short oldResFile = CurResFile() ;
- UseResFile(0);
- StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
- UseResFile(oldResFile);
+ short oldResFile = CurResFile() ;
+ UseResFile(0);
+ StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
+ UseResFile(oldResFile);
- if (chooserName && *chooserName)
- {
- int length = (*chooserName)[0] ;
- if ( length + 1 > maxSize )
- {
- length = maxSize - 1 ;
- }
- strncpy( buf , (char*) &(*chooserName)[1] , length ) ;
- buf[length] = 0 ;
- }
- else
- buf[0] = 0 ;
+ if (chooserName && *chooserName)
+ {
+ HLock( (Handle) chooserName ) ;
+ wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
+ HUnlock( (Handle) chooserName ) ;
+ ReleaseResource( (Handle) chooserName ) ;
+ wxStrncpy( buf , name , maxSize - 1 ) ;
+ }
+ else
+ buf[0] = 0 ;
- return TRUE;
+ return true;
}
-int wxKill(long pid, wxSignal sig , wxKillError *rc )
+int wxKill(long pid, wxSignal sig , wxKillError *rc, int flags)
{
// TODO
return 0;
WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
{
- // TODO : under classic there is no environement support, under X yes
- return false ;
+ // 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
+// 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 ;
+ // TODO : under classic there is no environement support, under X yes
+ return false ;
}
//
bool wxShell(const wxString& command)
{
// TODO
- return FALSE;
+ return false;
}
-// Shutdown or reboot the PC
+// Shutdown or reboot the PC
bool wxShutdown(wxShutdownFlags wFlags)
{
// TODO
- return FALSE;
+ return false;
}
-// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+wxPowerType wxGetPowerType()
{
- return FreeMem() ;
+ // TODO
+ return wxPOWER_UNKNOWN;
}
-void wxUsleep(unsigned long milliseconds)
+wxBatteryState wxGetBatteryState()
{
- clock_t start = clock() ;
- do
- {
- YieldToAnyThread() ;
- } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
+ // TODO
+ return wxBATTERY_UNKNOWN_STATE;
}
-void wxSleep(int nSecs)
+// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
+wxMemorySize wxGetFreeMemory()
{
- wxUsleep(1000*nSecs);
+ return (wxMemorySize)FreeMem() ;
}
-// Consume all events until no more left
-void wxFlushEvents()
+#ifndef __DARWIN__
+
+void wxMicroSleep(unsigned long microseconds)
{
+ AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime());
+ MPDelayUntil( & wakeup);
}
-#if WXWIN_COMPATIBILITY_2_2
-
-// Output a debug message, in a system dependent fashion.
-void wxDebugMsg(const char *fmt ...)
+void wxMilliSleep(unsigned long milliseconds)
{
- va_list ap;
- static char buffer[512];
-
- if (!wxTheApp->GetWantDebugOutput())
- return ;
-
- va_start(ap, fmt);
-
- vsprintf(buffer,fmt,ap) ;
- strcat(buffer,";g") ;
- c2pstr(buffer) ;
- DebugStr((unsigned char*) buffer) ;
-
- va_end(ap);
+ AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime());
+ MPDelayUntil( & wakeup);
}
-// Non-fatal error: pop up message box and (possibly) continue
-void wxError(const wxString& msg, const wxString& title)
+void wxSleep(int nSecs)
{
- if (wxMessageBox(wxString::Format(wxT("%s\nContinue?"),msg), title, wxYES_NO) == wxID_NO )
- wxExit();
+ wxMilliSleep(1000*nSecs);
}
-// Fatal error: pop up message box and abort
-void wxFatalError(const wxString& msg, const wxString& title)
+#endif
+
+// Consume all events until no more left
+void wxFlushEvents()
{
- wxMessageBox(wxString::Format(wxT("%s: %s"),title,msg));
- wxExit();
}
-#endif // WXWIN_COMPATIBILITY_2_2
-
#endif // !__DARWIN__
// Emit a beeeeeep
SysBeep(30);
}
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
{
- long theSystem ;
-
- // are there x-platform conventions ?
+ static wxToolkitInfo info;
+ info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
+ info.name = _T("wxBase");
+ return info;
+}
- Gestalt(gestaltSystemVersion, &theSystem) ;
- if (minorVsn != NULL) {
- *minorVsn = (theSystem & 0xFF ) ;
- }
- if (majorVsn != NULL) {
- *majorVsn = (theSystem >> 8 ) ;
- }
-#ifdef __DARWIN__
- return wxMAC_DARWIN;
-#else
- return wxMAC;
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+{
+ static wxToolkitInfo info;
+ info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
+ info.shortName = _T("mac");
+ info.name = _T("wxMac");
+#ifdef __WXUNIVERSAL__
+ info.shortName << _T("univ");
+ info.name << _T("/wxUniversal");
#endif
+ return info;
}
// Reading and writing resources (eg WIN.INI, .Xdefaults)
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
{
// TODO
- return FALSE;
+ return false;
}
bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
{
- char buf[50];
- sprintf(buf, "%.4f", value);
- return wxWriteResource(section, entry, buf, file);
+ wxString buf;
+ buf.Printf(wxT("%.4f"), value);
+
+ return wxWriteResource(section, entry, buf, file);
}
bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
{
- char buf[50];
- sprintf(buf, "%ld", value);
- return wxWriteResource(section, entry, buf, file);
+ wxString buf;
+ buf.Printf(wxT("%ld"), value);
+
+ return wxWriteResource(section, entry, buf, file);
}
bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
{
- char buf[50];
- sprintf(buf, "%d", value);
- return wxWriteResource(section, entry, buf, file);
+ wxString buf;
+ buf.Printf(wxT("%d"), value);
+
+ return wxWriteResource(section, entry, buf, file);
}
bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
{
// TODO
- return FALSE;
+ return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- *value = (float)strtod(s, NULL);
- delete[] s;
- return TRUE;
- }
- else return FALSE;
+ char *s = NULL;
+ bool succ = wxGetResource(section, entry, (char **)&s, file);
+ if (succ)
+ {
+ *value = (float)strtod(s, NULL);
+ delete[] s;
+ return true;
+ }
+ else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- *value = strtol(s, NULL, 10);
- delete[] s;
- return TRUE;
- }
- else return FALSE;
+ char *s = NULL;
+ bool succ = wxGetResource(section, entry, (char **)&s, file);
+ if (succ)
+ {
+ *value = strtol(s, NULL, 10);
+ delete[] s;
+ return true;
+ }
+ else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- *value = (int)strtol(s, NULL, 10);
- delete[] s;
- return TRUE;
- }
- else return FALSE;
+ char *s = NULL;
+ bool succ = wxGetResource(section, entry, (char **)&s, file);
+ if (succ)
+ {
+ *value = (int)strtol(s, NULL, 10);
+ delete[] s;
+ return true;
+ }
+ else return false;
}
#endif // wxUSE_RESOURCES
int gs_wxBusyCursorCount = 0;
-extern wxCursor gMacCurrentCursor ;
-wxCursor gMacStoredActiveCursor ;
+extern wxCursor gMacCurrentCursor ;
+wxCursor gMacStoredActiveCursor ;
// Set the cursor to the busy cursor for all windows
void wxBeginBusyCursor(wxCursor *cursor)
{
- if (gs_wxBusyCursorCount++ == 0)
- {
- gMacStoredActiveCursor = gMacCurrentCursor ;
- cursor->MacInstall() ;
- }
- //else: nothing to do, already set
+ if (gs_wxBusyCursorCount++ == 0)
+ {
+ gMacStoredActiveCursor = gMacCurrentCursor ;
+ cursor->MacInstall() ;
+ }
+ //else: nothing to do, already set
}
// Restore cursor to normal
void wxEndBusyCursor()
{
wxCHECK_RET( gs_wxBusyCursorCount > 0,
- wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );
+ wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );
- if (--gs_wxBusyCursorCount == 0)
- {
- gMacStoredActiveCursor.MacInstall() ;
- gMacStoredActiveCursor = wxNullCursor ;
- }
+ if (--gs_wxBusyCursorCount == 0)
+ {
+ gMacStoredActiveCursor.MacInstall() ;
+ gMacStoredActiveCursor = wxNullCursor ;
+ }
}
-// TRUE if we're between the above two calls
+// true if we're between the above two calls
bool wxIsBusy()
{
- return (gs_wxBusyCursorCount > 0);
+ return (gs_wxBusyCursorCount > 0);
}
+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
wxString wxMacFindFolder( short vol,
- OSType folderType,
- Boolean createFolder)
+ OSType folderType,
+ Boolean createFolder)
{
- short vRefNum ;
- long dirID ;
+ FSRef fsRef ;
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 ;
-}
-#ifndef __DARWIN__
-char *wxGetUserHome (const wxString& user)
-{
- // TODO
- return NULL;
+ if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)
+ strDir = wxMacFSRefToPath( &fsRef ) + wxFILE_SEP_PATH ;
+
+ return strDir ;
}
-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
-{
- if ( path.empty() )
- return FALSE;
-
- wxString p = path ;
- if (p[0] == ':' ) {
- p = wxGetCwd() + p ;
- }
-
- int pos = p.Find(':') ;
- if ( pos != wxNOT_FOUND ) {
- p = p.Mid(1,pos) ;
- }
-
- p = p + ":" ;
-
- Str255 volumeName ;
- XVolumeParam pb ;
-
- wxMacStringToPascal( p , volumeName ) ;
- OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
- if ( err == noErr ) {
- if ( pTotal ) {
- (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
- }
- if ( pFree ) {
- (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
- }
- }
+#endif // wxUSE_BASE
- return err == noErr ;
-}
-#endif
+#if wxUSE_GUI
// Check whether this window wants to process messages, e.g. Stop button
// in long calculations.
bool wxCheckForInterrupt(wxWindow *wnd)
{
// TODO
- return FALSE;
+ return false;
}
void wxGetMousePosition( int* x, int* y )
*y = pt.v ;
};
-// Return TRUE if we have a colour display
+// Return true if we have a colour display
bool wxColourDisplay()
{
- return TRUE;
+ return true;
}
// Returns depth of screen
int wxDisplayDepth()
{
- Rect globRect ;
- SetRect(&globRect, -32760, -32760, 32760, 32760);
- GDHandle theMaxDevice;
+ Rect globRect ;
+ SetRect(&globRect, -32760, -32760, 32760, 32760);
+ GDHandle theMaxDevice;
- int theDepth = 8;
- theMaxDevice = GetMaxDevice(&globRect);
- if (theMaxDevice != nil)
- theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
+ int theDepth = 8;
+ theMaxDevice = GetMaxDevice(&globRect);
+ if (theMaxDevice != nil)
+ theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
- return theDepth ;
+ return theDepth ;
}
// 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 (width != NULL) {
+ *width = screenBits.bounds.right - screenBits.bounds.left ;
+ }
+ if (height != NULL) {
+ *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+ }
}
void wxDisplaySizeMM(int *width, int *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 );
+
+ if (width != NULL) {
+ *width = int( *width * cvPt2Mm );
+ }
+ if (height != NULL) {
+ *height = int( *height * cvPt2Mm );
+ }
}
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{
- BitMap screenBits;
- GetQDGlobalsScreenBits( &screenBits );
-
- if (x) *x = 0;
- if (y) *y = 0;
-
- *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 ;
+ Rect r ;
+ GetAvailableWindowPositioningBounds( GetMainDevice() , &r ) ;
+ if ( x )
+ *x = r.left ;
if ( y )
- *y = mheight ;
+ *y = r.top ;
+ if ( width )
+ *width = r.right - r.left ;
+ if ( height )
+ *height = r.bottom - r.top ;
}
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
return wxGenericFindWindowAtPoint(pt);
}
+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
wxString wxGetOsDescription()
{
#ifdef WXWIN_OS_DESCRIPTION
// use configure generated description if available
- return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+ return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
#else
- return "MacOS" ; //TODO:define further
+ return wxT("MacOS") ; //TODO:define further
#endif
}
-//---------------------------------------------------------------------------
-// wxMac Specific utility functions
-//---------------------------------------------------------------------------
+#ifndef __DARWIN__
+wxChar *wxGetUserHome (const wxString& user)
+{
+ // TODO
+ return NULL;
+}
-char StringMac[] = "\x0d\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
- "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
- "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xae\xaf"
- "\xb1\xb4\xb5\xb6\xbb\xbc\xbe\xbf"
- "\xc0\xc1\xc2\xc4\xc7\xc8\xc9\xcb\xcc\xcd\xce\xcf"
- "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xca\xdb" ;
+bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+{
+ if ( path.empty() )
+ return false;
-char StringANSI[] = "\x0a\xC4\xC5\xC7\xC9\xD1\xD6\xDC\xE1\xE0\xE2\xE4\xE3\xE5\xE7\xE9\xE8"
- "\xEA\xEB\xED\xEC\xEE\xEF\xF1\xF3\xF2\xF4\xF6\xF5\xFA\xF9\xFB\xFC"
- "\x86\xBA\xA2\xA3\xA7\x95\xB6\xDF\xAE\xA9\x99\xB4\xA8\xC6\xD8"
- "\xB1\xA5\xB5\xF0\xAA\xBA\xE6\xF8"
- "\xBF\xA1\xAC\x83\xAB\xBB\x85\xC0\xC3\xD5\x8C\x9C"
- "\x96\x97\x93\x94\x91\x92\xF7\xFF\xA0\x80" ;
+ wxString p = path ;
+ if (p[0u] == ':' ) {
+ p = wxGetCwd() + p ;
+ }
-void wxMacConvertFromPC( const char *from , char *to , int len )
-{
- char *c ;
- if ( from == to )
- {
- for( int i = 0 ; i < len ; ++ i )
- {
- c = strchr( StringANSI , *from ) ;
- if ( c != NULL )
- {
- *to = StringMac[ c - StringANSI] ;
- }
- ++to ;
- ++from ;
- }
+ int pos = p.Find(':') ;
+ if ( pos != wxNOT_FOUND ) {
+ p = p.Mid(1,pos) ;
}
- else
+
+ p = p + wxT(":") ;
+
+ OSErr err = noErr ;
+
+ FSRef fsRef ;
+ err = wxMacPathToFSRef( p , &fsRef ) ;
+ if ( noErr == err )
{
- for( int i = 0 ; i < len ; ++ i )
+ FSVolumeRefNum vRefNum ;
+ err = FSGetVRefNum( &fsRef , &vRefNum ) ;
+ if ( noErr == err )
{
- c = strchr( StringANSI , *from ) ;
- if ( c != NULL )
+ UInt64 freeBytes , totalBytes ;
+ err = FSGetVInfo( vRefNum , NULL , &freeBytes , &totalBytes ) ;
+ if ( noErr == err )
{
- *to = StringMac[ c - StringANSI] ;
+ if ( pTotal )
+ *pTotal = wxLongLong( totalBytes ) ;
+ if ( pFree )
+ *pFree = wxLongLong( freeBytes ) ;
}
- else
- {
- *to = *from ;
- }
- ++to ;
- ++from ;
}
}
+
+ return err == noErr ;
}
+#endif // !__DARWIN__
-void wxMacConvertToPC( const char *from , char *to , int len )
+//---------------------------------------------------------------------------
+// wxMac Specific utility functions
+//---------------------------------------------------------------------------
+
+void wxMacStringToPascal( const wxString&from , StringPtr to )
+{
+ wxCharBuffer buf = from.mb_str( wxConvLocal ) ;
+ int len = strlen(buf) ;
+
+ if ( len > 255 )
+ len = 255 ;
+ to[0] = len ;
+ memcpy( (char*) &to[1] , buf , len ) ;
+}
+
+wxString wxMacMakeStringFromPascal( ConstStringPtr from )
+{
+ return wxString( (char*) &from[1] , wxConvLocal , from[0] ) ;
+}
+
+
+// ----------------------------------------------------------------------------
+// Common Event Support
+// ----------------------------------------------------------------------------
+
+
+extern ProcessSerialNumber gAppProcess ;
+
+void wxMacWakeUp()
{
- char *c ;
- if ( from == to )
+ ProcessSerialNumber psn ;
+ Boolean isSame ;
+ psn.highLongOfPSN = 0 ;
+ psn.lowLongOfPSN = kCurrentProcess ;
+ SameProcess( &gAppProcess , &psn , &isSame ) ;
+ if ( isSame )
{
- for( int i = 0 ; i < len ; ++ i )
+#if TARGET_CARBON
+ static wxMacCarbonEvent s_wakeupEvent ;
+ OSStatus err = noErr ;
+ if ( !s_wakeupEvent.IsValid() )
{
- c = strchr( StringMac , *from ) ;
- if ( c != NULL )
- {
- *to = StringANSI[ c - StringMac] ;
- }
- ++to ;
- ++from ;
+ err = s_wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),
+ kEventAttributeNone ) ;
+ }
+ if ( err == noErr )
+ {
+ if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
+ return ;
+ s_wakeupEvent.SetTime(0) ;
+ err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
+ kEventPriorityHigh);
}
+#else
+ PostEvent( nullEvent , 0 ) ;
+#endif
}
else
{
- for( int i = 0 ; i < len ; ++ i )
- {
- c = strchr( StringMac , *from ) ;
- if ( c != NULL )
- {
- *to = StringANSI[ c - StringMac] ;
- }
- else
- {
- *to = *from ;
- }
- ++to ;
- ++from ;
- }
+ WakeUpProcess( &gAppProcess ) ;
}
}
-wxString wxMacMakeMacStringFromPC( const char * p )
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+
+// ----------------------------------------------------------------------------
+// Carbon Event Support
+// ----------------------------------------------------------------------------
+
+
+OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData)
+{
+ return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData ) ;
+}
+
+OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, const void * inData)
+{
+ return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData ) ;
+}
+
+// ----------------------------------------------------------------------------
+// Control Access Support
+// ----------------------------------------------------------------------------
+
+void wxMacControl::Dispose()
+{
+ ::DisposeControl( m_controlRef ) ;
+ m_controlRef = NULL ;
+}
+
+void wxMacControl::SetReference( SInt32 data )
+{
+ SetControlReference( m_controlRef , data ) ;
+}
+
+OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const
+{
+ return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;
+}
+
+OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const
+{
+ return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ;
+}
+
+OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData)
+{
+ return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData ) ;
+}
+
+OSStatus wxMacControl::SendEvent( EventRef event , OptionBits inOptions )
+{
+#if TARGET_API_MAC_OSX
+ return SendEventToEventTargetWithOptions( event,
+ HIObjectGetEventTarget( (HIObjectRef) m_controlRef ), inOptions );
+#else
+ #pragma unused(inOptions)
+ return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) ) ;
+#endif
+}
+
+OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions )
+{
+ wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess ) ;
+ event.SetParameter<HICommand>(kEventParamDirectObject,command) ;
+ return SendEvent( event , inOptions ) ;
+}
+
+OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions )
+{
+ HICommand command ;
+ memset( &command, 0 , sizeof(command) ) ;
+ command.commandID = commandID ;
+ return SendHICommand( command , inOptions ) ;
+}
+
+void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
{
- wxString result ;
- int len = strlen ( p ) ;
- if ( len > 0 )
- {
- wxChar* ptr = result.GetWriteBuf(len) ;
- wxMacConvertFromPC( p , ptr , len ) ;
- ptr[len] = 0 ;
- result.UngetWriteBuf( len ) ;
- }
- return result ;
+ HiliteControl( m_controlRef , part ) ;
+ unsigned long finalTicks ;
+ Delay( ticks , &finalTicks ) ;
+ HiliteControl( m_controlRef , kControlNoPart ) ;
}
-wxString wxMacMakePCStringFromMac( const char * p )
+SInt32 wxMacControl::GetValue() const
{
- wxString result ;
- int len = strlen ( p ) ;
- if ( len > 0 )
- {
- wxChar* ptr = result.GetWriteBuf(len) ;
- wxMacConvertToPC( p , ptr , len ) ;
- ptr[len] = 0 ;
- result.UngetWriteBuf( len ) ;
- }
- return result ;
+ return ::GetControl32BitValue( m_controlRef ) ;
}
-wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding )
+SInt32 wxMacControl::GetMaximum() const
{
- if (mac2pcEncoding)
+ return ::GetControl32BitMaximum( m_controlRef ) ;
+}
+
+SInt32 wxMacControl::GetMinimum() const
+{
+ return ::GetControl32BitMinimum( m_controlRef ) ;
+}
+
+void wxMacControl::SetValue( SInt32 v )
+{
+ ::SetControl32BitValue( m_controlRef , v ) ;
+}
+
+void wxMacControl::SetMinimum( SInt32 v )
+{
+ ::SetControl32BitMinimum( m_controlRef , v ) ;
+}
+
+void wxMacControl::SetMaximum( SInt32 v )
+{
+ ::SetControl32BitMaximum( m_controlRef , v ) ;
+}
+
+void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum )
+{
+ ::SetControl32BitMinimum( m_controlRef , minimum ) ;
+ ::SetControl32BitMaximum( m_controlRef , maximum ) ;
+ ::SetControl32BitValue( m_controlRef , value ) ;
+}
+
+OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart )
+{
+ return SetKeyboardFocus( GetControlOwner( m_controlRef ) ,
+ m_controlRef , focusPart ) ;
+}
+
+bool wxMacControl::HasFocus() const
+{
+ ControlRef control ;
+ GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
+ return control == m_controlRef ;
+}
+
+bool wxMacControl::NeedsFocusRect() const
+{
+ return false ;
+}
+
+void wxMacControl::VisibilityChanged(bool shown)
+{
+}
+
+void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
+{
+ m_font = font ;
+ ControlFontStyleRec fontStyle;
+ if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
{
- return wxMacMakePCStringFromMac( from ) ;
+ switch( font.MacGetThemeFontID() )
+ {
+ case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ;
+ case 109 /*mini font */ : fontStyle.font = -5 ; break ;
+ case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ;
+ default : fontStyle.font = kControlFontBigSystemFont ; break ;
+ }
+ fontStyle.flags = kControlUseFontMask ;
}
else
{
- return wxString( from ) ;
+ fontStyle.font = font.MacGetFontNum() ;
+ fontStyle.style = font.MacGetFontStyle() ;
+ fontStyle.size = font.MacGetFontSize() ;
+ fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
}
-}
-//
-// Pascal Strings
-//
+ fontStyle.just = teJustLeft ;
+ fontStyle.flags |= kControlUseJustMask ;
+ if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+ fontStyle.just = teJustCenter ;
+ else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+ fontStyle.just = teJustRight ;
-wxString wxMacMakeStringFromPascal( ConstStringPtr from , bool mac2pcEncoding )
-{
- // this is safe since a pascal string can never be larger than 256 bytes
- char s[256] ;
- CopyPascalStringToC( from , s ) ;
- if (mac2pcEncoding)
+
+ // we only should do this in case of a non-standard color, as otherwise 'disabled' controls
+ // won't get grayed out by the system anymore
+
+ if ( foreground != *wxBLACK )
{
- return wxMacMakePCStringFromMac( s ) ;
+ fontStyle.foreColor = MAC_WXCOLORREF(foreground.GetPixel() ) ;
+ fontStyle.flags |= kControlUseForeColorMask ;
}
+
+ ::SetControlFontStyle( m_controlRef , &fontStyle );
+}
+
+void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) )
+{
+ // TODO
+ // setting up a color proc is not recommended anymore
+}
+
+void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
+{
+ ::SetControl32BitMinimum( m_controlRef , minimum ) ;
+ ::SetControl32BitMaximum( m_controlRef , maximum ) ;
+}
+
+short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers )
+{
+ return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ) ;
+}
+
+void wxMacControl::SetActionProc( ControlActionUPP actionProc )
+{
+ SetControlAction( m_controlRef , actionProc ) ;
+}
+
+void wxMacControl::SetViewSize( SInt32 viewSize )
+{
+ SetControlViewSize(m_controlRef , viewSize ) ;
+}
+
+SInt32 wxMacControl::GetViewSize() const
+{
+ return GetControlViewSize( m_controlRef ) ;
+}
+
+bool wxMacControl::IsVisible() const
+{
+ return IsControlVisible( m_controlRef ) ;
+}
+
+void wxMacControl::SetVisibility( bool visible , bool redraw )
+{
+ SetControlVisibility( m_controlRef , visible , redraw ) ;
+}
+
+bool wxMacControl::IsEnabled() const
+{
+#if TARGET_API_MAC_OSX
+ return IsControlEnabled( m_controlRef ) ;
+#else
+ return IsControlActive( m_controlRef ) ;
+#endif
+}
+
+bool wxMacControl::IsActive() const
+{
+ return IsControlActive( m_controlRef ) ;
+}
+
+void wxMacControl::Enable( bool enable )
+{
+#if TARGET_API_MAC_OSX
+ if ( enable )
+ EnableControl( m_controlRef ) ;
else
- {
- return wxString( s ) ;
- }
+ DisableControl( m_controlRef ) ;
+#else
+ if ( enable )
+ ActivateControl( m_controlRef ) ;
+ else
+ DeactivateControl( m_controlRef ) ;
+#endif
}
-void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding )
+void wxMacControl::SetDrawingEnabled( bool enable )
{
- if (pc2macEncoding)
- {
- CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ;
- }
+#if TARGET_API_MAC_OSX
+ HIViewSetDrawingEnabled( m_controlRef , enable ) ;
+#endif
+}
+
+bool wxMacControl::GetNeedsDisplay() const
+{
+#if TARGET_API_MAC_OSX
+ return HIViewGetNeedsDisplay( m_controlRef ) ;
+#else
+ return false ;
+#endif
+}
+
+void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where )
+{
+#if TARGET_API_MAC_OSX
+ if ( where != NULL )
+ HIViewSetNeedsDisplayInRegion( m_controlRef , where , needsDisplay ) ;
+ else
+ HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ;
+#endif
+}
+
+void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )
+{
+#if TARGET_API_MAC_OSX
+ HIPoint hiPoint ;
+ hiPoint.x = pt->x ;
+ hiPoint.y = pt->y ;
+ HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef ) ;
+ pt->x = (int)hiPoint.x ;
+ pt->y = (int)hiPoint.y ;
+#endif
+}
+
+void wxMacControl::SetRect( Rect *r )
+{
+#if TARGET_API_MAC_OSX
+ //A HIRect is actually a CGRect on OSX - which consists of two structures -
+ //CGPoint and CGSize, which have two floats each
+ HIRect hir = { { r->left , r->top }, { r->right - r->left , r->bottom - r->top } } ;
+ HIViewSetFrame ( m_controlRef , &hir ) ;
+#else
+ SetControlBounds( m_controlRef , r ) ;
+#endif
+
+}
+
+void wxMacControl::GetRect( Rect *r )
+{
+ GetControlBounds( m_controlRef , r ) ;
+}
+
+void wxMacControl::GetRectInWindowCoords( Rect *r )
+{
+ UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ;
+}
+
+void wxMacControl::GetBestRect( Rect *r )
+{
+ short baselineoffset ;
+ GetBestControlRect( m_controlRef , r , &baselineoffset ) ;
+}
+
+void wxMacControl::SetTitle( const wxString &title )
+{
+ wxFontEncoding encoding;
+
+ if ( m_font.Ok() )
+ encoding = m_font.GetEncoding();
else
+ encoding = wxFont::GetDefaultEncoding();
+
+ UMASetControlTitle( m_controlRef , title , encoding ) ;
+}
+
+void wxMacControl::GetFeatures( UInt32 * features )
+{
+ GetControlFeatures( m_controlRef , features ) ;
+}
+
+OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )
+{
+ return GetControlRegion( m_controlRef , partCode , region ) ;
+}
+
+OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )
+{
+#if TARGET_API_MAC_OSX
+ return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
+ (other != NULL) ? other->m_controlRef : NULL) ;
+#else
+ return 0 ;
+#endif
+}
+
+
+#if TARGET_API_MAC_OSX
+// SetNeedsDisplay would not invalidate the children
+static void InvalidateControlAndChildren( HIViewRef control )
+{
+ HIViewSetNeedsDisplay( control , true ) ;
+ UInt16 childrenCount = 0 ;
+ OSStatus err = CountSubControls( control , &childrenCount ) ;
+ if ( err == errControlIsNotEmbedder )
+ return ;
+ wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
+
+ for ( UInt16 i = childrenCount ; i >=1 ; --i )
{
- CopyCStringToPascal( from , to ) ;
+ HIViewRef child ;
+ err = GetIndexedSubControl( control , i , & child ) ;
+ if ( err == errControlIsNotEmbedder )
+ return ;
+ InvalidateControlAndChildren( child ) ;
}
}
+#endif
+
+void wxMacControl::InvalidateWithChildren()
+{
+#if TARGET_API_MAC_OSX
+ InvalidateControlAndChildren( m_controlRef ) ;
+#endif
+}
+
+void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy )
+{
+#if TARGET_API_MAC_OSX
+ HIRect scrollarea = CGRectMake( r.x , r.y , r.width , r.height) ;
+ HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ) ;
+#endif
+}
+
+
+// SetNeedsDisplay would not invalidate the children
-//
-// CFStringRefs (Carbon only)
+//
+// Databrowser
//
-#if TARGET_CARBON
-// converts this string into a carbon foundation string with optional pc 2 mac encoding
-CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding )
+OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options )
+{
+ return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
+}
+
+OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
+ DataBrowserTableViewColumnIndex position )
+{
+ return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
+}
+
+OSStatus wxMacControl::AutoSizeListViewColumns()
+{
+ return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
+}
+
+OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert )
+{
+ return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
+}
+
+OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
+{
+ return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
+}
+
+OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height)
+{
+ return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height ) ;
+}
+
+OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks * callbacks)
+{
+ return SetDataBrowserCallbacks( m_controlRef , callbacks ) ;
+}
+
+OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,
+ const DataBrowserItemID* items,
+ DataBrowserPropertyID preSortProperty,
+ DataBrowserPropertyID propertyID )
+{
+ return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID ) ;
+}
+
+bool wxMacControl::IsItemSelected( DataBrowserItemID item )
+{
+ return IsDataBrowserItemSelected( m_controlRef , item ) ;
+}
+
+OSStatus wxMacControl::AddItems( DataBrowserItemID container, UInt32 numItems,
+ const DataBrowserItemID* items,
+ DataBrowserPropertyID preSortProperty )
+{
+ return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
+}
+
+OSStatus wxMacControl::RemoveItems( DataBrowserItemID container, UInt32 numItems,
+ const DataBrowserItemID* items,
+ DataBrowserPropertyID preSortProperty )
+{
+ return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
+}
+
+OSStatus wxMacControl::RevealItem( DataBrowserItemID item,
+ DataBrowserPropertyID propertyID,
+ DataBrowserRevealOptions options )
+{
+ return RevealDataBrowserItem( m_controlRef , item , propertyID , options ) ;
+}
+
+OSStatus wxMacControl::SetSelectedItems(UInt32 numItems,
+ const DataBrowserItemID * items,
+ DataBrowserSetOption operation )
+{
+ return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation ) ;
+}
+
+OSStatus wxMacControl::GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last )
+{
+ return GetDataBrowserSelectionAnchor( m_controlRef , first , last ) ;
+}
+
+//
+// Tab Control
+//
+
+OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
{
- return CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
- pc2macEncoding ?
- kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
+ return ::SetTabEnabled( m_controlRef , tabNo , enable ) ;
}
-#endif //TARGET_CARBON
+#endif // wxUSE_GUI
projects / wxWidgets.git / blobdiff