Compilation fixes for old SDKs (VC6) after recent commit.

[wxWidgets.git] / include / wx / palmos / choice.h

diff --git a/include/wx/palmos/choice.h b/include/wx/palmos/choice.h
index 91bd1c0abccb803ac5a729a3263602c5fd8a12f3..fa140208314084a1673f7cd2d3faa3126b71b3dc 100644 (file)
--- a/include/wx/palmos/choice.h
+++ b/include/wx/palmos/choice.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.h
+// Name:        wx/palmos/choice.h

 // Purpose:     wxChoice class
 // Purpose:     wxChoice class

-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Yunhui Fu

 // Created:     10/13/04
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,15 +12,11 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

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

 // ----------------------------------------------------------------------------
 // Choice item
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Choice item
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -68,31 +64,23 @@ public:
                 const wxString& name = wxChoiceNameStr);
 
     // implement base class pure virtuals
                 const wxString& name = wxChoiceNameStr);
 
     // implement base class pure virtuals

-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, int pos);
-    virtual void Delete(int n);
-    virtual void Clear();
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();

 
 

-    virtual int GetCount() const;
+    virtual unsigned int GetCount() const;

     virtual int GetSelection() const;
     virtual void SetSelection(int n);
 
     virtual int GetSelection() const;
     virtual void SetSelection(int n);
 

-    virtual int FindString(const wxString& s) const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& s);
-
-    // MSW only
-    virtual bool MSWCommand(WXUINT param, WXWORD id);
-    WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);

 
 protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);

-    virtual void DoSetItemClientData( int n, void* clientData );
-    virtual void* DoGetItemClientData( int n ) const;
-    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
-    virtual wxClientData* DoGetItemClientObject( int n ) const;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;

 
     // MSW implementation
     virtual wxSize DoGetBestSize() const;
 
     // MSW implementation
     virtual wxSize DoGetBestSize() const;


@@ -101,9 +89,6 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 

-    virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
-
-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
     // update the height of the drop down list to fit the number of items we
     // have (without changing the visible height)
 
     // update the height of the drop down list to fit the number of items we
     // have (without changing the visible height)