X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4e41ce37ac7bcb43663241439cee68ebeff7ffc..b0803032d3dad9ac066df82b242e94d49408de8c:/include/wx/mac/listbox.h diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h index ed538622dd..0df5bd0366 100644 --- a/include/wx/mac/listbox.h +++ b/include/wx/mac/listbox.h @@ -13,7 +13,7 @@ #ifndef _WX_LISTBOX_H_ #define _WX_LISTBOX_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "listbox.h" #endif @@ -21,7 +21,7 @@ // simple types // ---------------------------------------------------------------------------- #include "wx/dynarray.h" - +#include "wx/arrstr.h" #if wxUSE_OWNER_DRAWN class WXDLLEXPORT wxOwnerDrawn; @@ -58,6 +58,16 @@ public: { Create(parent, id, pos, size, n, choices, style, validator, name); } + wxListBox(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr) + { + Create(parent, id, pos, size, choices, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -66,6 +76,13 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); + 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 = wxListBoxNameStr); virtual ~wxListBox(); virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL); @@ -111,7 +128,7 @@ public: // Windows callbacks virtual void SetupColours(); - virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; + virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; virtual bool MacCanFocus() const { return true ; } void OnChar(wxKeyEvent& event);