Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patches for wxBU_EXACTFIT to button.cpp and tglbtn.cpp

Browse Source 
Applied patch for SGI's 12-bit visuals to bitmap.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-01-12 11:36:43 +00:00
parent d491523b1f
commit 8ab696e0a9
6 changed files with 238 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk1/button.cpp
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -81,7 +81,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxButton creation failed") );
return FALSE;
return FALSE;
}
/*
@@ -89,7 +89,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
for (size_t i = 0; i < label2.Len(); i++)
{
if (label2.GetChar(i) == wxT('&'))
label2.SetChar(i,wxT('_'));
label2.SetChar(i,wxT('_'));
}
GtkWidget *accel_label = gtk_accel_label_new( label2.mb_str() );
@@ -186,7 +186,12 @@ void wxButton::ApplyWidgetStyle()
wxSize wxButton::DoGetBestSize() const
{
wxSize ret( wxControl::DoGetBestSize() );
if (ret.x < 80) ret.x = 80;
if (!HasFlag(wxBU_EXACTFIT))
{
if (ret.x < 80) ret.x = 80;
}
return ret;
}