Upgrade WX to r74856, mainly to support @2x.

This commit is contained in:
comex
2013-09-22 18:44:55 -04:00
parent 0bdef3932f
commit 66ed9a1804
1935 changed files with 45373 additions and 22739 deletions

View File

@ -2,7 +2,6 @@
// Name: wx/gtk/choice.h
// Purpose:
// Author: Robert Roebling
// Id: $Id: choice.h 65818 2010-10-15 23:46:32Z VZ $
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -64,8 +63,6 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
void SendSelectionChangedEvent(wxEventType evt_type);
int GetSelection() const;
void SetSelection(int n);
@ -95,6 +92,7 @@ protected:
int m_stringCellIndex;
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
virtual int DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos,
void **clientData, wxClientDataType type);