mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-09-07 18:31:15 +00:00
822326eea9
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
383 lines
11 KiB
C++
383 lines
11 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/gtk/bmpcbox.cpp
|
|
// Purpose: wxBitmapComboBox
|
|
// Author: Jaakko Salli
|
|
// Created: 2008-05-19
|
|
// Copyright: (c) 2008 Jaakko Salli
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ============================================================================
|
|
// declarations
|
|
// ============================================================================
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_BITMAPCOMBOBOX
|
|
|
|
#include "wx/bmpcbox.h"
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/log.h"
|
|
#endif
|
|
|
|
#include <gtk/gtk.h>
|
|
#include "wx/gtk/private.h"
|
|
|
|
// ============================================================================
|
|
// implementation
|
|
// ============================================================================
|
|
|
|
|
|
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxComboBox);
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxBitmapComboBox creation
|
|
// ----------------------------------------------------------------------------
|
|
|
|
void wxBitmapComboBox::Init()
|
|
{
|
|
m_bitmapCellIndex = 0;
|
|
m_stringCellIndex = 1;
|
|
m_bitmapSize = wxSize(-1, -1);
|
|
}
|
|
|
|
wxBitmapComboBox::wxBitmapComboBox(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& value,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
const wxArrayString& choices,
|
|
long style,
|
|
const wxValidator& validator,
|
|
const wxString& name)
|
|
: wxComboBox(),
|
|
wxBitmapComboBoxBase()
|
|
{
|
|
Init();
|
|
|
|
Create(parent,id,value,pos,size,choices,style,validator,name);
|
|
}
|
|
|
|
bool wxBitmapComboBox::Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& value,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
const wxArrayString& choices,
|
|
long style,
|
|
const wxValidator& validator,
|
|
const wxString& name)
|
|
{
|
|
wxCArrayString chs(choices);
|
|
return Create(parent, id, value, pos, size, chs.GetCount(),
|
|
chs.GetStrings(), style, validator, name);
|
|
}
|
|
|
|
bool wxBitmapComboBox::Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& value,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
int n,
|
|
const wxString choices[],
|
|
long style,
|
|
const wxValidator& validator,
|
|
const wxString& name)
|
|
{
|
|
if ( !wxComboBox::Create(parent, id, value, pos, size,
|
|
n, choices, style, validator, name) )
|
|
return false;
|
|
|
|
// Select 'value' in entry-less mode
|
|
if ( !GetEntry() )
|
|
{
|
|
int i = FindString(value);
|
|
if (i != wxNOT_FOUND)
|
|
SetSelection(i);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void wxBitmapComboBox::GTKCreateComboBoxWidget()
|
|
{
|
|
GtkListStore *store;
|
|
|
|
store = gtk_list_store_new( 2, G_TYPE_OBJECT, G_TYPE_STRING );
|
|
|
|
if ( HasFlag(wxCB_READONLY) )
|
|
{
|
|
m_widget = gtk_combo_box_new_with_model( GTK_TREE_MODEL(store) );
|
|
}
|
|
else
|
|
{
|
|
#ifdef __WXGTK3__
|
|
m_widget = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store));
|
|
gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(m_widget), m_stringCellIndex);
|
|
#else
|
|
m_widget = gtk_combo_box_entry_new_with_model( GTK_TREE_MODEL(store), m_stringCellIndex );
|
|
#endif
|
|
m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
|
|
gtk_editable_set_editable(GTK_EDITABLE(m_entry), true);
|
|
}
|
|
g_object_ref(m_widget);
|
|
|
|
// This must be called as gtk_combo_box_entry_new_with_model adds
|
|
// automatically adds one text column.
|
|
gtk_cell_layout_clear( GTK_CELL_LAYOUT(m_widget) );
|
|
|
|
GtkCellRenderer* imageRenderer = gtk_cell_renderer_pixbuf_new();
|
|
gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(m_widget),
|
|
imageRenderer, FALSE);
|
|
gtk_cell_layout_add_attribute( GTK_CELL_LAYOUT(m_widget),
|
|
imageRenderer, "pixbuf", 0);
|
|
|
|
GtkCellRenderer* textRenderer = gtk_cell_renderer_text_new();
|
|
gtk_cell_layout_pack_end( GTK_CELL_LAYOUT(m_widget),
|
|
textRenderer, TRUE );
|
|
gtk_cell_layout_add_attribute( GTK_CELL_LAYOUT(m_widget),
|
|
textRenderer, "text", 1);
|
|
}
|
|
|
|
wxBitmapComboBox::~wxBitmapComboBox()
|
|
{
|
|
}
|
|
|
|
GtkWidget* wxBitmapComboBox::GetConnectWidget()
|
|
{
|
|
if ( GetEntry() )
|
|
return wxComboBox::GetConnectWidget();
|
|
|
|
return wxChoice::GetConnectWidget();
|
|
}
|
|
|
|
GdkWindow *wxBitmapComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
|
|
{
|
|
if ( GetEntry() )
|
|
return wxComboBox::GTKGetWindow(windows);
|
|
|
|
return wxChoice::GTKGetWindow(windows);
|
|
}
|
|
|
|
wxSize wxBitmapComboBox::DoGetBestSize() const
|
|
{
|
|
wxSize best = wxComboBox::DoGetBestSize();
|
|
|
|
int delta = GetBitmapSize().y - GetCharHeight();
|
|
if ( delta > 0 )
|
|
{
|
|
best.y += delta;
|
|
CacheBestSize(best);
|
|
}
|
|
return best;
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Item manipulation
|
|
// ----------------------------------------------------------------------------
|
|
|
|
void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
|
|
{
|
|
if ( bitmap.IsOk() )
|
|
{
|
|
if ( m_bitmapSize.x < 0 )
|
|
{
|
|
m_bitmapSize.x = bitmap.GetWidth();
|
|
m_bitmapSize.y = bitmap.GetHeight();
|
|
}
|
|
|
|
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
|
|
GtkTreeModel *model = gtk_combo_box_get_model( combobox );
|
|
GtkTreeIter iter;
|
|
|
|
if ( gtk_tree_model_iter_nth_child( model, &iter, NULL, n ) )
|
|
{
|
|
GValue value0 = G_VALUE_INIT;
|
|
g_value_init( &value0, G_TYPE_OBJECT );
|
|
g_value_set_object( &value0, bitmap.GetPixbuf() );
|
|
gtk_list_store_set_value( GTK_LIST_STORE(model), &iter,
|
|
m_bitmapCellIndex, &value0 );
|
|
g_value_unset( &value0 );
|
|
}
|
|
}
|
|
}
|
|
|
|
wxBitmap wxBitmapComboBox::GetItemBitmap(unsigned int n) const
|
|
{
|
|
wxBitmap bitmap;
|
|
|
|
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
|
|
GtkTreeModel *model = gtk_combo_box_get_model( combobox );
|
|
GtkTreeIter iter;
|
|
|
|
if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
|
|
{
|
|
GValue value = G_VALUE_INIT;
|
|
gtk_tree_model_get_value( model, &iter,
|
|
m_bitmapCellIndex, &value );
|
|
GdkPixbuf* pixbuf = (GdkPixbuf*) g_value_get_object( &value );
|
|
if ( pixbuf )
|
|
{
|
|
g_object_ref( pixbuf );
|
|
bitmap = wxBitmap(pixbuf);
|
|
}
|
|
g_value_unset( &value );
|
|
}
|
|
|
|
return bitmap;
|
|
}
|
|
|
|
int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap)
|
|
{
|
|
const int n = wxComboBox::Append(item);
|
|
if ( n != wxNOT_FOUND )
|
|
SetItemBitmap(n, bitmap);
|
|
return n;
|
|
}
|
|
|
|
int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap,
|
|
void *clientData)
|
|
{
|
|
const int n = wxComboBox::Append(item, clientData);
|
|
if ( n != wxNOT_FOUND )
|
|
SetItemBitmap(n, bitmap);
|
|
return n;
|
|
}
|
|
|
|
int wxBitmapComboBox::Append(const wxString& item, const wxBitmap& bitmap,
|
|
wxClientData *clientData)
|
|
{
|
|
const int n = wxComboBox::Append(item, clientData);
|
|
if ( n != wxNOT_FOUND )
|
|
SetItemBitmap(n, bitmap);
|
|
return n;
|
|
}
|
|
|
|
int wxBitmapComboBox::Insert(const wxString& item,
|
|
const wxBitmap& bitmap,
|
|
unsigned int pos)
|
|
{
|
|
const int n = wxComboBox::Insert(item, pos);
|
|
if ( n != wxNOT_FOUND )
|
|
SetItemBitmap(n, bitmap);
|
|
return n;
|
|
}
|
|
|
|
int wxBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap,
|
|
unsigned int pos, wxClientData *clientData)
|
|
{
|
|
const int n = wxComboBox::Insert(item, pos, clientData);
|
|
if ( n != wxNOT_FOUND )
|
|
SetItemBitmap(n, bitmap);
|
|
return n;
|
|
}
|
|
|
|
int wxBitmapComboBox::Insert(const wxString& item, const wxBitmap& bitmap,
|
|
unsigned int pos, void *clientData)
|
|
{
|
|
const int n = wxComboBox::Insert(item, pos, clientData);
|
|
if ( n != wxNOT_FOUND )
|
|
SetItemBitmap(n, bitmap);
|
|
return n;
|
|
}
|
|
|
|
void wxBitmapComboBox::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text )
|
|
{
|
|
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
|
|
GtkTreeModel *model = gtk_combo_box_get_model( combobox );
|
|
GtkListStore *store = GTK_LIST_STORE( model );
|
|
GtkTreeIter iter;
|
|
|
|
gtk_list_store_insert( store, &iter, n );
|
|
|
|
GValue value = G_VALUE_INIT;
|
|
g_value_init( &value, G_TYPE_STRING );
|
|
g_value_set_string( &value, wxGTK_CONV( text ) );
|
|
gtk_list_store_set_value( store, &iter, m_stringCellIndex, &value );
|
|
g_value_unset( &value );
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxTextEntry interface override
|
|
// ----------------------------------------------------------------------------
|
|
|
|
void wxBitmapComboBox::WriteText(const wxString& value)
|
|
{
|
|
if ( GetEntry() )
|
|
wxComboBox::WriteText(value);
|
|
else
|
|
SetStringSelection(value);
|
|
}
|
|
|
|
wxString wxBitmapComboBox::GetValue() const
|
|
{
|
|
if ( GetEntry() )
|
|
return wxComboBox::GetValue();
|
|
|
|
return GetStringSelection();
|
|
}
|
|
|
|
void wxBitmapComboBox::Remove(long from, long to)
|
|
{
|
|
if ( GetEntry() )
|
|
wxComboBox::Remove(from, to);
|
|
}
|
|
|
|
void wxBitmapComboBox::SetInsertionPoint(long pos)
|
|
{
|
|
if ( GetEntry() )
|
|
wxComboBox::SetInsertionPoint(pos);
|
|
}
|
|
|
|
long wxBitmapComboBox::GetInsertionPoint() const
|
|
{
|
|
if ( GetEntry() )
|
|
return wxComboBox::GetInsertionPoint();
|
|
|
|
return 0;
|
|
}
|
|
long wxBitmapComboBox::GetLastPosition() const
|
|
{
|
|
if ( GetEntry() )
|
|
return wxComboBox::GetLastPosition();
|
|
|
|
return 0;
|
|
}
|
|
|
|
void wxBitmapComboBox::SetSelection(long from, long to)
|
|
{
|
|
if ( GetEntry() )
|
|
wxComboBox::SetSelection(from, to);
|
|
}
|
|
|
|
void wxBitmapComboBox::GetSelection(long *from, long *to) const
|
|
{
|
|
if ( GetEntry() )
|
|
wxComboBox::GetSelection(from, to);
|
|
}
|
|
|
|
bool wxBitmapComboBox::IsEditable() const
|
|
{
|
|
if ( GetEntry() )
|
|
return wxTextEntry::IsEditable();
|
|
|
|
return false;
|
|
}
|
|
|
|
void wxBitmapComboBox::SetEditable(bool editable)
|
|
{
|
|
if ( GetEntry() )
|
|
wxComboBox::SetEditable(editable);
|
|
}
|
|
|
|
#endif // wxUSE_BITMAPCOMBOBOX
|