fixing NULL warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -318,7 +318,7 @@ void wxCursor::CreateFromImage(const wxImage & image)
|
||||
|
||||
(**ch).crsrHotSpot.h = hotSpotX ;
|
||||
(**ch).crsrHotSpot.v = hotSpotY ;
|
||||
(**ch).crsrXTable = NULL ;
|
||||
(**ch).crsrXTable = 0 ;
|
||||
(**ch).crsrID = GetCTSeed() ;
|
||||
|
||||
memset( (**ch).crsr1Data , 0 , sizeof( Bits16 ) ) ;
|
||||
|
@@ -509,31 +509,31 @@ void wxFont::SetNoAntiAliasing( bool no )
|
||||
|
||||
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
|
||||
{
|
||||
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
|
||||
{
|
||||
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
|
||||
{
|
||||
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
|
||||
{
|
||||
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
|
||||
wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );
|
||||
return M_FONTDATA->m_underlined;
|
||||
}
|
||||
|
||||
@@ -551,31 +551,31 @@ wxFontEncoding wxFont::GetEncoding() 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
|
||||
{
|
||||
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
|
||||
{
|
||||
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
|
||||
{
|
||||
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
|
||||
{
|
||||
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
|
||||
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
|
||||
return M_FONTDATA->m_macATSUFontID;
|
||||
}
|
||||
|
||||
@@ -587,13 +587,13 @@ void* wxFont::MacGetATSUStyle() 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
|
||||
{
|
||||
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
|
||||
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
|
||||
return M_FONTDATA->m_macThemeFontID;
|
||||
}
|
||||
|
||||
|
@@ -265,7 +265,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
||||
|
||||
wxListBox::~wxListBox()
|
||||
{
|
||||
m_peer->SetReference( NULL ) ;
|
||||
m_peer->SetReference( 0 ) ;
|
||||
FreeData() ;
|
||||
// avoid access during destruction
|
||||
if ( m_macList )
|
||||
|
@@ -40,7 +40,7 @@ void wxMacCreateNotifierTable()
|
||||
for ( int i = 0 ; i < kMaxEvents ; ++i )
|
||||
{
|
||||
gMacNotificationEvents.proc[i] = NULL ;
|
||||
gMacNotificationEvents.events[i] = NULL ;
|
||||
gMacNotificationEvents.events[i] = 0 ;
|
||||
gMacNotificationEvents.data[i] = NULL ;
|
||||
}
|
||||
}
|
||||
@@ -119,7 +119,7 @@ void wxMacProcessNotifierEvents()
|
||||
wxMacNotificationProcPtr handler = gMacNotificationEvents.proc[index] ;
|
||||
|
||||
gMacNotificationEvents.data[index] = NULL ;
|
||||
gMacNotificationEvents.events[index] = NULL ;
|
||||
gMacNotificationEvents.events[index] = 0 ;
|
||||
gMacNotificationEvents.proc[index] = NULL ;
|
||||
|
||||
if ( handler )
|
||||
|
@@ -1638,7 +1638,7 @@ bool wxThreadModule::OnInit()
|
||||
|
||||
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() ;
|
||||
|
||||
|
@@ -194,7 +194,7 @@ long UMAGetProcessMode()
|
||||
ProcessInfoRec processinfo;
|
||||
ProcessSerialNumber procno ;
|
||||
|
||||
procno.highLongOfPSN = NULL ;
|
||||
procno.highLongOfPSN = 0 ;
|
||||
procno.lowLongOfPSN = kCurrentProcess ;
|
||||
processinfo.processInfoLength = sizeof(ProcessInfoRec);
|
||||
processinfo.processName = NULL;
|
||||
|
Reference in New Issue
Block a user