merge with latest sources

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2000-08-09 10:10:14 +00:00
parent 57681e5bfd
commit 2f1ae41432
176 changed files with 7712 additions and 5094 deletions

View File

@@ -16,17 +16,33 @@
#include "wx/cursor.h"
#include "wx/icon.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
#endif
const short kwxCursorHandId = 9 ;
const short kwxCursorSizeWEId = 10 ;
const short kwxCursorSizeNSId = 11 ;
#if !TARGET_CARBON
Cursor* MacArrowCursorPtr = &qd.arrow ;
CursHandle MacArrowCursor = &MacArrowCursorPtr ;
#else
bool MacArrowInstalled = false ;
Cursor MacArrow ;
Cursor* MacArrowCursorPtr = &MacArrow ;
CursHandle MacArrowCursor = &MacArrowCursorPtr ;
#endif
CursHandle gMacCurrentCursor = NULL ;
wxCursorRefData::wxCursorRefData()
{
#if TARGET_CARBON
if ( !MacArrowInstalled )
{
MacArrowCursorPtr = GetQDGlobalsArrow( &MacArrow ) ;
MacArrowInstalled = true ;
}
#endif
m_width = 32;
m_height = 32;
m_hCursor = NULL ;
@@ -34,8 +50,8 @@ wxCursorRefData::wxCursorRefData()
wxCursorRefData::~wxCursorRefData()
{
if ( m_hCursor && ( m_hCursor != MacArrowCursor ) )
::DisposeHandle( (Handle) m_hCursor ) ;
// if ( m_hCursor && ( m_hCursor != MacArrowCursor ) )
// ::ReleaseResource( (Handle) m_hCursor ) ;
}
// Cursors