Don't use m_popupInterface pointer if it is still NULL

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

diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp
index 1a48dfcf53130d2f4035b8bf84b495f94cada078..d9ba679dd68e36d95279d1cc0ae48d68a90032e7 100644 (file)
--- a/src/palmos/choice.cpp
+++ b/src/palmos/choice.cpp
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "choice.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,8 +25,9 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/choice.h"

     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/brush.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/brush.h"


@@ -158,12 +155,12 @@ int wxChoice::DoAppend(const wxString& item)
     return 0;
 }
 
     return 0;
 }
 

-int wxChoice::DoInsert(const wxString& item, int pos)
+int wxChoice::DoInsert(const wxString& item, unsigned int pos)

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-void wxChoice::Delete(int n)
+void wxChoice::Delete(unsigned int n)

 {
 }
 
 {
 }
 


@@ -192,45 +189,38 @@ void wxChoice::SetSelection(int n)
 // string list functions
 // ----------------------------------------------------------------------------
 
 // string list functions
 // ----------------------------------------------------------------------------
 

-int wxChoice::GetCount() const
-{
-    return 0;
-}
-
-int wxChoice::FindString(const wxString& s) const
+unsigned int wxChoice::GetCount() const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-void wxChoice::SetString(int n, const wxString& s)
+void wxChoice::SetString(unsigned int n, const wxString& s)

 {
 }
 
 {
 }
 

-wxString wxChoice::GetString(int n) const
+wxString wxChoice::GetString(unsigned int n) const

 {
 {

-    wxString str;
-
-    return str;
+    return wxEmptyString;

 }
 
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 

-void wxChoice::DoSetItemClientData( int n, void* clientData )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)

 {
 }
 
 {
 }
 

-void* wxChoice::DoGetItemClientData( int n ) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const

 {
     return (void *)NULL;
 }
 
 {
     return (void *)NULL;
 }
 

-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData )

 {
 }
 
 {
 }
 

-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const

 {
     return (wxClientData *)DoGetItemClientData(n);
 }
 {
     return (wxClientData *)DoGetItemClientData(n);
 }