Don't complain under MicroWindows if a wxDC's HDC is NULL - it happens

[wxWidgets.git] / src / mac / choice.cpp

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 73dfa522d3df73fd958705feb647509e7e891c04..67aee1e9283c6ce7150168c3bc4c39dc471a520c 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -13,7 +13,8 @@
 #pragma implementation "choice.h"
 #endif
 
 #pragma implementation "choice.h"
 #endif
 

-// For compilers that support precompilation, includes "wx.h".
+#include "wx/defs.h"
+

 #include "wx/choice.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 #include "wx/choice.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"


@@ -76,7 +77,7 @@ int wxChoice::DoAppend(const wxString& item)
        m_datas.Add( NULL ) ;
        int index = m_strings.GetCount()  - 1  ;
        DoSetItemClientData( index , NULL ) ;
        m_datas.Add( NULL ) ;
        int index = m_strings.GetCount()  - 1  ;
        DoSetItemClientData( index , NULL ) ;

-       SetControlMaximum( m_macControl , Number()) ;
+       SetControlMaximum( m_macControl , GetCount()) ;

        return index ;
 }
 
        return index ;
 }
 


@@ -92,7 +93,7 @@ void wxChoice::Delete(int n)
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;
     m_datas.Remove( n ) ;
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;
     m_datas.Remove( n ) ;

-       SetControlMaximum( m_macControl , Number()) ;
+       SetControlMaximum( m_macControl , GetCount()) ;

 }
 
 void wxChoice::Clear()
 }
 
 void wxChoice::Clear()