fixing NULL warnings

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

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index eace8c0b5d51cfff7f12eb66850cc6fe82e5a046..839673c2dd624f16e9a5cea59f6956dc3022b677 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -318,7 +318,7 @@ void wxCursor::CreateFromImage(const wxImage & image)
 
     (**ch).crsrHotSpot.h = hotSpotX ;
     (**ch).crsrHotSpot.v = hotSpotY ;
 
     (**ch).crsrHotSpot.h = hotSpotX ;
     (**ch).crsrHotSpot.v = hotSpotY ;

-    (**ch).crsrXTable = NULL ; 
+    (**ch).crsrXTable = 0 ; 

     (**ch).crsrID = GetCTSeed() ;
     
     memset( (**ch).crsr1Data  , 0 , sizeof( Bits16 ) ) ;
     (**ch).crsrID = GetCTSeed() ;
     
     memset( (**ch).crsr1Data  , 0 , sizeof( Bits16 ) ) ;

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index d50e88a9186b44d69ba3e0d56355fdf6f4ba02ed..6a6ab75b09dc42d63f0b49685127b9c37904e087 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -509,31 +509,31 @@ void wxFont::SetNoAntiAliasing( bool no )
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_pointSize;
 }
 
 int wxFont::GetFamily() const
 {
     return M_FONTDATA->m_pointSize;
 }
 
 int wxFont::GetFamily() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );

     return M_FONTDATA->m_underlined;
 }
 
     return M_FONTDATA->m_underlined;
 }
 


@@ -551,31 +551,31 @@ wxFontEncoding wxFont::GetEncoding() const
 
 bool wxFont::GetNoAntiAliasing() const
 {
 
 bool wxFont::GetNoAntiAliasing() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );

     return M_FONTDATA->m_noAA;
 }
 
 short wxFont::MacGetFontNum() const
 {
     return M_FONTDATA->m_noAA;
 }
 
 short wxFont::MacGetFontNum() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macFontNum;
 }
 
 short wxFont::MacGetFontSize() const
 {
     return M_FONTDATA->m_macFontNum;
 }
 
 short wxFont::MacGetFontSize() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macFontSize;
 }
 
 wxByte wxFont::MacGetFontStyle() const
 {
     return M_FONTDATA->m_macFontSize;
 }
 
 wxByte wxFont::MacGetFontStyle() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macFontStyle;
 }
 
 wxUint32 wxFont::MacGetATSUFontID() const
 {
     return M_FONTDATA->m_macFontStyle;
 }
 
 wxUint32 wxFont::MacGetATSUFontID() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macATSUFontID;
 }
 
     return M_FONTDATA->m_macATSUFontID;
 }
 


@@ -587,13 +587,13 @@ void* wxFont::MacGetATSUStyle() const
 
 wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
 {
 
 wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macATSUAdditionalQDStyles;
 }
 
 wxUint16 wxFont::MacGetThemeFontID() const 
 {
     return M_FONTDATA->m_macATSUAdditionalQDStyles;
 }
 
 wxUint16 wxFont::MacGetThemeFontID() const 
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macThemeFontID;
 }
 
     return M_FONTDATA->m_macThemeFontID;
 }
 

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 7c8ca90473a7d0543e69f4c9feca6fff7666c996..b4b4edc23d27628b90a1d1d3ae06c98124ad7a92 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -265,7 +265,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

-    m_peer->SetReference( NULL ) ;
+    m_peer->SetReference( 0 ) ;

     FreeData() ;
     // avoid access during destruction
     if ( m_macList )
     FreeData() ;
     // avoid access during destruction
     if ( m_macList )

diff --git a/src/mac/carbon/macnotfy.cpp b/src/mac/carbon/macnotfy.cpp
index 08d304bb49dc519789fc3306d8c478b0c6bc9cc6..8d22be40fd28ca6b104f28235571a521da4d44c5 100644 (file)
--- a/src/mac/carbon/macnotfy.cpp
+++ b/src/mac/carbon/macnotfy.cpp
@@ -40,7 +40,7 @@ void wxMacCreateNotifierTable()
     for ( int i = 0 ; i < kMaxEvents ; ++i )
     {
         gMacNotificationEvents.proc[i] = NULL ;
     for ( int i = 0 ; i < kMaxEvents ; ++i )
     {
         gMacNotificationEvents.proc[i] = NULL ;

-        gMacNotificationEvents.events[i] = NULL ;
+        gMacNotificationEvents.events[i] = 0 ;

         gMacNotificationEvents.data[i] = NULL ;
     }
 }
         gMacNotificationEvents.data[i] = NULL ;
     }
 }


@@ -119,7 +119,7 @@ void wxMacProcessNotifierEvents()
             wxMacNotificationProcPtr handler =  gMacNotificationEvents.proc[index] ;
             
             gMacNotificationEvents.data[index] = NULL ;
             wxMacNotificationProcPtr handler =  gMacNotificationEvents.proc[index] ;
             
             gMacNotificationEvents.data[index] = NULL ;

-            gMacNotificationEvents.events[index] = NULL ;
+            gMacNotificationEvents.events[index] = 0 ;

             gMacNotificationEvents.proc[index]  = NULL ;
             
             if ( handler )
             gMacNotificationEvents.proc[index]  = NULL ;
             
             if ( handler )

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 010a4c5cffa0b5a2a6cca461b0ee66b9cb34f7a1..0915d13a234b049b79d78af5ce25ce96af9f4c86 100644 (file)
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -1638,7 +1638,7 @@ bool wxThreadModule::OnInit()
        
        verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
        // main thread's This() is NULL
        
        verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
        // main thread's This() is NULL

-       verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , NULL ) ) ;
+       verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , 0 ) ) ;

 
        gs_idMainThread = wxThread::GetCurrentId() ;
        
 
        gs_idMainThread = wxThread::GetCurrentId() ;
        

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 9f577b30f575baf40e0fd5bc74b3e32a951837f1..ba57727478eb8fcf9c3d5b60a225beb367ad28f5 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -194,7 +194,7 @@ long UMAGetProcessMode()
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
 
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
 

-    procno.highLongOfPSN = NULL ;
+    procno.highLongOfPSN = 0 ;

     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;