minor corrections for compilation with gcc 3.3 (use cast of address instead

of address of cast)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 5f7d68f6bd97f5537665cb538e21b48cc2489750..39086ddeb8b5f9272e19be06009de2ea3072bcf2 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -578,7 +578,7 @@ bool wxApp::OnInitGui()
 
     InstallApplicationEventHandler(
         GetwxAppEventHandlerUPP(),
 
     InstallApplicationEventHandler(
         GetwxAppEventHandlerUPP(),

-        GetEventTypeCount(eventList), eventList, wxTheApp, &((EventHandlerRef)wxTheApp->m_macEventHandler));
+        GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler));

 #endif
 
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
 #endif
 
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 5f7d68f6bd97f5537665cb538e21b48cc2489750..39086ddeb8b5f9272e19be06009de2ea3072bcf2 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -578,7 +578,7 @@ bool wxApp::OnInitGui()
 
     InstallApplicationEventHandler(
         GetwxAppEventHandlerUPP(),
 
     InstallApplicationEventHandler(
         GetwxAppEventHandlerUPP(),

-        GetEventTypeCount(eventList), eventList, wxTheApp, &((EventHandlerRef)wxTheApp->m_macEventHandler));
+        GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler));

 #endif
 
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
 #endif
 
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 593c01c367a93e2a89f581af47afa705e5c4d2d4..420d5dce829fc5a9f1df26b50f901f3c6d355874 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -1781,7 +1781,7 @@ void wxDC::MacInstallFont() const
     Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ;
     Style qdStyle = font->m_macFontStyle ;
     ATSUFontID    atsuFont = font->m_macATSUFontID ;
     Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ;
     Style qdStyle = font->m_macFontStyle ;
     ATSUFontID    atsuFont = font->m_macATSUFontID ;

-    status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ;
+    status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUIStyle) ;

     wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ;
     ATSUAttributeTag atsuTags[] =
     {
     wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ;
     ATSUAttributeTag atsuTags[] =
     {

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 17740e7ccea3a5fc56c37463ad5a1685b5535a5d..8a280cf29e1e1eb7006cbd01508ae7614ee4e350 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -722,7 +722,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1,
             (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
         long size ;
         m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1,
             (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
         long size ;

-        ::GetControlData((ControlHandle)  m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &((TEHandle) m_macTE) , &size ) ;
+        ::GetControlData((ControlHandle)  m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*)((TEHandle *)&m_macTE) , &size ) ;

 
     }
     else
 
     }
     else

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index b4864e8f2145465be307affc43e3294092f58fa2..66c28891ca9c1d75ed1903227aa78f118c2c2eef 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -681,7 +681,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
 #if TARGET_CARBON
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
 #if TARGET_CARBON
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),

-        GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
+        GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler);

 #endif
     m_macFocus = NULL ;
 
 #endif
     m_macFocus = NULL ;
 

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 593c01c367a93e2a89f581af47afa705e5c4d2d4..420d5dce829fc5a9f1df26b50f901f3c6d355874 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -1781,7 +1781,7 @@ void wxDC::MacInstallFont() const
     Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ;
     Style qdStyle = font->m_macFontStyle ;
     ATSUFontID    atsuFont = font->m_macATSUFontID ;
     Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ;
     Style qdStyle = font->m_macFontStyle ;
     ATSUFontID    atsuFont = font->m_macATSUFontID ;

-    status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ;
+    status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUIStyle) ;

     wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ;
     ATSUAttributeTag atsuTags[] =
     {
     wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ;
     ATSUAttributeTag atsuTags[] =
     {

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 17740e7ccea3a5fc56c37463ad5a1685b5535a5d..8a280cf29e1e1eb7006cbd01508ae7614ee4e350 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -722,7 +722,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1,
             (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
         long size ;
         m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1,
             (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
         long size ;

-        ::GetControlData((ControlHandle)  m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &((TEHandle) m_macTE) , &size ) ;
+        ::GetControlData((ControlHandle)  m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*)((TEHandle *)&m_macTE) , &size ) ;

 
     }
     else
 
     }
     else

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index b4864e8f2145465be307affc43e3294092f58fa2..66c28891ca9c1d75ed1903227aa78f118c2c2eef 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -681,7 +681,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
 #if TARGET_CARBON
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
 #if TARGET_CARBON
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),

-        GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
+        GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler);

 #endif
     m_macFocus = NULL ;
 
 #endif
     m_macFocus = NULL ;