changed choice to properly inherit from wxChoiceBase , added msg compatible calls...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 231f3511229a198109ca56fa52018cc494fcc31f..fa92e234d1b4c3f630e70cc86b75efbe44eeda14 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -18,10 +18,14 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+  #include  <wx/dynarray.h>
+

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

+WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
+

 // Choice item
 // Choice item

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

 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 


@@ -48,17 +52,23 @@ class WXDLLEXPORT wxChoice: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
 

-  virtual void Append(const wxString& item);
-  // Added min Append and GetClientData
-  virtual void Append(const wxString& item, void *client_data);
-  virtual void *GetClientData(int index) const;
+    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 GetSelection() const ;
   virtual void SetSelection(int n);

-  virtual inline void Select( int n ) { SetSelection( n ); }

   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   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 ) ;
+
+/*
+  virtual void Append(const wxString& item);
+  // Added min Append and GetClientData
+  virtual void Append(const wxString& item, void *client_data);
+  virtual void *GetClientData(int index) const;
+  virtual inline void Select( int n ) { SetSelection( n ); }

   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);


@@ -67,12 +77,23 @@ class WXDLLEXPORT wxChoice: public wxControl
   virtual inline int GetCount() const { return m_strings.GetCount(); }
   virtual void Command(wxCommandEvent& event);
 
   virtual inline int GetCount() const { return m_strings.GetCount(); }
   virtual void Command(wxCommandEvent& event);
 

-  virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;

   virtual inline int GetColumns() const { return 1 ; };
   virtual inline int GetColumns() const { return 1 ; };

-       void            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
-
+*/

 protected:
 protected:

+    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;
   wxArrayString m_strings;

+  wxChoiceDataArray m_dataArray ;

   MenuHandle   m_macPopUpMenuHandle ;
 };
 
   MenuHandle   m_macPopUpMenuHandle ;
 };
 

diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h
index 48cad8933adce20c157c726502251c9079bdd37b..a17d51af4bdb7a8eb161e91cabaa25a0fae66657 100644 (file)
--- a/include/wx/mac/statbmp.h
+++ b/include/wx/mac/statbmp.h
@@ -52,6 +52,20 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
 
   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
 
 
   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
 

+    // for compatibility with wxMSW
+    const wxIcon& GetIcon() const
+    {
+        // don't use wxDynamicCast, icons and bitmaps are really the same thing
+        // in wxGTK
+        return (const wxIcon &)m_messageBitmap;
+    }
+
+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+

   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
        wxSize DoGetBestSize() const ;
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
        wxSize DoGetBestSize() const ;