Patches to ComboBox and ControlWithItems

This patch fixes Append and Insert so they work with the
void * 
argument.  The typemap for this was fixed a long time ago, I
guess these 
changes either never got uploaded by me or I hadn't gotten
to these.

Roy

C:\RubyDev>cvs -d :pserver:anonymousrubyforge.org:/var/cvs/wxruby login 
Logging in to :pserver:anonymousrubyforge.org:2401:/var/cvs/wxruby

C:\RubyDev>cvs -d :pserver:anonymousrubyforge.org:/var/cvs/wxruby diff -b -u
wxruby2/swig/classes/include/wxControlWithItems.h 
Index: wxruby2/swig/classes/include/wxControlWithItems.h
============================================================
=======
RCS file:
/var/cvs/wxruby/wxruby2/swig/classes/include/wxControlWithIt
ems.h,v
retrieving revision 1.5
diff -b -u -r1.5 wxControlWithItems.h
--- wxruby2/swig/classes/include/wxControlWithItems.h	10 Sep
2005 03:31:21 -0000	1.5
+++ wxruby2/swig/classes/include/wxControlWithItems.h	25 Aug
2006 22:10:45 -0000
 -10,8
+10,7 
 public:
 
   virtual int Append(const wxString&   item )  = 0;
-// this causes problems for swig directors
-//  virtual int Append(const wxString&   item , void *
clientData )  = 0;
+  virtual int Append(const wxString&   item , void *
clientData )  = 0;
   virtual int Append(const wxString&   item ,
wxClientData * clientData )  = 0;
   virtual void Append(const wxArrayString&  strings ) 
= 0;
   virtual void Clear()  = 0;
 -24,8
+23,7 
   virtual wxString GetString(int  n ) const = 0;
   virtual wxString GetStringSelection() const = 0;
   virtual int Insert(const wxString&   item , int  pos
) = 0;
-// this causes problems for swig directors
-//  virtual int Insert(const wxString&   item , int 
pos , void * clientData ) = 0;
+  virtual int Insert(const wxString&   item , int  pos
, void * clientData ) = 0;
   virtual int Insert(const wxString&   item , int  pos
, wxClientData * clientData ) = 0;
   virtual bool IsEmpty() const = 0;
   void SetClientData(int  n , void * data ) = 0;

C:\RubyDev>cvs -d :pserver:anonymousrubyforge.org:/var/cvs/wxruby login 
Logging in to :pserver:anonymousrubyforge.org:2401:/var/cvs/wxruby

C:\RubyDev>cvs -d :pserver:anonymousrubyforge.org:/var/cvs/wxruby diff -b -u
wxruby2/swig/classes/include/wxComboBox.h 
Index: wxruby2/swig/classes/include/wxComboBox.h
============================================================
=======
RCS file:
/var/cvs/wxruby/wxruby2/swig/classes/include/wxComboBox.h,v
retrieving revision 1.11
diff -b -u -r1.11 wxComboBox.h
--- wxruby2/swig/classes/include/wxComboBox.h	30 Apr 2006
00:14:20 -0000	1.11
+++ wxruby2/swig/classes/include/wxComboBox.h	25 Aug 2006
22:07:07 -0000
 -71,7
+71,7 
 
   // override pure virtuals in a base class
   virtual int Append(const wxString&   item );
-  //virtual int Append(const wxString&   item , void *
clientData );
+  virtual int Append(const wxString&   item , void *
clientData );
   virtual int Append(const wxString&   item ,
wxClientData * clientData );
   virtual void Append(const wxArrayString&  strings );
   virtual void Clear();
 -84,10
+84,10 
   virtual wxString GetString(int  n ) const;
   virtual wxString GetStringSelection() const;
   virtual void Insert(const wxString&   item , int  pos
);
-  //virtual int Insert(const wxString&   item , int 
pos , void * clientData );
+  virtual int Insert(const wxString&   item , int  pos
, void * clientData );
   virtual void Insert(const wxString&   item , int  pos
, wxClientData * clientData );
   virtual bool IsEmpty() const;
-  //virtual void SetClientData(int  n , void * data ) ;
+  virtual void SetClientData(int  n , void * data ) ;
   virtual void SetClientObject(int  n , wxClientData * data
) ;
   virtual void SetSelection(int  n );
   virtual void SetString(int  n , const wxString&  
string );
_______________________________________________
wxruby-users mailing list
wxruby-usersrubyforge.org
ht
tp://rubyforge.org/mailman/listinfo/wxruby-users