mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 01:59:52 -06:00
Update to wxWidgets r67291.
Fixes a wxFileSelector regression on OS X. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7404 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
6
Externals/wxWidgets3/include/wx/combo.h
vendored
6
Externals/wxWidgets3/include/wx/combo.h
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Jaakko Salli
|
||||
// Modified by:
|
||||
// Created: Apr-30-2006
|
||||
// RCS-ID: $Id: combo.h 67256 2011-03-20 11:15:17Z JMS $
|
||||
// RCS-ID: $Id: combo.h 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Jaakko Salli
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -87,7 +87,7 @@ enum
|
||||
wxCC_IFLAG_CREATED = 0x0100,
|
||||
// Internal use: really put button outside
|
||||
wxCC_IFLAG_BUTTON_OUTSIDE = 0x0200,
|
||||
// Internal use: SetMargins has been succesfully called
|
||||
// Internal use: SetMargins has been successfully called
|
||||
wxCC_IFLAG_LEFT_MARGIN_SET = 0x0400,
|
||||
// Internal use: Set wxTAB_TRAVERSAL to parent when popup is dismissed
|
||||
wxCC_IFLAG_PARENT_TAB_TRAVERSAL = 0x0800,
|
||||
@ -674,7 +674,7 @@ protected:
|
||||
wxRect m_tcArea;
|
||||
wxRect m_btnArea;
|
||||
|
||||
// Colour of the the text area, in case m_text is NULL
|
||||
// Colour of the text area, in case m_text is NULL
|
||||
wxColour m_tcBgCol;
|
||||
|
||||
// current button state (uses renderer flags)
|
||||
|
Reference in New Issue
Block a user