blind attempt to fix wxMac compilation (__UNIX__ defined on OS X?)

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

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index a122f95f3787de5c490d02a646f515b0dedcdad7..4c10bab315ef2574864ab567a4f30ebd731c291b 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -1,26 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#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"
+#include  "wx/arrstr.h"

 
 

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

 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 


@@ -46,6 +47,16 @@ public:
   {
     Create(parent, id, pos, size, n, choices, style, validator, name);
   }
   {
     Create(parent, id, pos, size, n, choices, style, validator, name);
   }

+  wxChoice(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxChoiceNameStr)
+  {
+    Create(parent, id, pos, size, choices, style, validator, name);
+  }

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


@@ -54,9 +65,17 @@ public:
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);

+  bool Create(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxChoiceNameStr);

 
   // implement base class pure virtuals
   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();
 


@@ -67,39 +86,26 @@ public:
   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( WXWidget control , wxInt16 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);
-
-  // Mac specific
-  virtual void Command(wxCommandEvent& event);
-  void         MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-
-  virtual inline int GetColumns() const { return 1 ; };
-*/
+    void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+

 protected:
     virtual wxSize DoGetBestSize() const ;
 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;
 

+protected:

     // free all memory we have (used by Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()   
     void FreeData();
 
   wxArrayString m_strings;
   wxChoiceDataArray m_datas ;
     // free all memory we have (used by Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()   
     void FreeData();
 
   wxArrayString m_strings;
   wxChoiceDataArray m_datas ;

-  WXHMENU      m_macPopUpMenuHandle ;
+  WXHMENU    m_macPopUpMenuHandle ;

 };
 
 #endif
 };
 
 #endif

-       // _WX_CHOICE_H_
+    // _WX_CHOICE_H_