Avoid double free in wxComboBox::SetClientObject.

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

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index fa92e234d1b4c3f630e70cc86b75efbe44eeda14..26ac3359c0766f78447bcd7b9bc4b7c3fbc77eb8 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -1,37 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.h
 // Purpose:     wxChoice class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.h
 // Purpose:     wxChoice class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "choice.h"
 #endif
 
 #include "wx/control.h"
 
 #pragma interface "choice.h"
 #endif
 
 #include "wx/control.h"
 

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

 
 

-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;

 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {

-  DECLARE_DYNAMIC_CLASS(wxChoice)
+    DECLARE_DYNAMIC_CLASS(wxChoice)

 
 

- public:
-  wxChoice() {}
-  ~wxChoice() ;
+public:
+    wxChoice()
+        : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL)
+        {}
+    
+    virtual ~wxChoice() ;

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


@@ -52,50 +55,39 @@ 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 int DoInsert(const wxString& item, int pos);

   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 ) ;
-
-/*
-  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 inline int Number() const { return m_strings.GetCount(); }
-  virtual inline int GetCount() const { return m_strings.GetCount(); }
-  virtual void Command(wxCommandEvent& event);
-
-  virtual inline int GetColumns() const { return 1 ; };
-*/
+    void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+

 protected:
 protected:

+    virtual wxSize DoGetBestSize() const ;
+
+public: // for wxComboBox only

     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);
-
+protected:

     // free all memory we have (used by Clear() and dtor)
     // free all memory we have (used by Clear() and dtor)

-    void Free();
+    // prevent collision with some BSD definitions of macro Free()   
+    void FreeData();

 
   wxArrayString m_strings;
 
   wxArrayString m_strings;

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

 };
 
 #endif
 };
 
 #endif

-       // _WX_CHOICE_H_
+    // _WX_CHOICE_H_