More unicode related cleanup and fixes for wxPython

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

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index fa92e234d1b4c3f630e70cc86b75efbe44eeda14..998f06d20329dce6c9bdfb0b63650b3294a7c47a 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-  #include  <wx/dynarray.h>
+  #include  "wx/dynarray.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 


@@ -31,7 +31,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 
  public:
   wxChoice() {}
 
  public:
   wxChoice() {}

-  ~wxChoice() ;
+  virtual ~wxChoice() ;

 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -52,16 +52,19 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
 

-    virtual int DoAppend(const wxString& item);
+  // implement base class pure virtuals
+  virtual int DoAppend(const wxString& item);

   virtual void Delete(int n);
   virtual void Clear();
   virtual void Delete(int n);
   virtual void Clear();

+

   virtual int GetCount() const ;
   virtual int GetSelection() const ;
   virtual void SetSelection(int n);
   virtual int GetCount() const ;
   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 , const wxString& s ) ;
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetString( int , const wxString& s ) ;

-       void            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+       void            MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;

 
 /*
   virtual void Append(const wxString& item);
 
 /*
   virtual void Append(const wxString& item);


@@ -73,28 +76,25 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 

-  virtual inline int Number() const { return m_strings.GetCount(); }
-  virtual inline int GetCount() const { return m_strings.GetCount(); }
+  // Mac specific

   virtual void Command(wxCommandEvent& event);
   virtual void Command(wxCommandEvent& event);

+  void         MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;

 
   virtual inline int GetColumns() const { return 1 ; };
 */
 protected:
 
   virtual inline int GetColumns() const { return 1 ; };
 */
 protected:

+    virtual wxSize DoGetBestSize() const ;

     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( 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 DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-

     // free all memory we have (used by Clear() and dtor)
     void Free();
 
   wxArrayString m_strings;
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
   wxArrayString m_strings;

-  wxChoiceDataArray m_dataArray ;
-  MenuHandle   m_macPopUpMenuHandle ;
+  wxChoiceDataArray m_datas ;
+  WXHMENU      m_macPopUpMenuHandle ;

 };
 
 #endif
 };
 
 #endif