Compilation fix after wxCB_ flags move.

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

diff --git a/include/wx/palmos/combobox.h b/include/wx/palmos/combobox.h
index ac52a54f3931eabf5f322fcdeb8fe1c72e6ba0e4..bfb46589c5c0709601b4e2f8896ac457ec3a80c2 100644 (file)
--- a/include/wx/palmos/combobox.h
+++ b/include/wx/palmos/combobox.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/combobox.h
+// Name:        wx/palmos/combobox.h
 // Purpose:     wxComboBox class
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,10 +12,6 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "combobox.h"
-#endif
-
 #include "wx/choice.h"
 
 #if wxUSE_COMBOBOX
@@ -85,7 +81,7 @@ public:
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
@@ -108,9 +104,6 @@ public:
     bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
     WXHWND GetEditHWND() const;
 
 protected: