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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/prntbase.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -37,7 +37,8 @@
#include "wx/stattext.h"
#include "wx/intl.h"
#include "wx/textdlg.h"
#endif
#include "wx/sizer.h"
#endif // !WX_PRECOMP
#include "wx/prntbase.h"
#include "wx/dcprint.h"
@@ -47,8 +48,6 @@
#include <stdlib.h>
#include <string.h>
#include <wx/sizer.h>
#ifdef __WXMSW__
#include "wx/msw/private.h"
#include <commdlg.h>
@@ -475,11 +474,11 @@ void wxPreviewControlBar::CreateButtons()
if (m_buttonFlags & wxPREVIEW_ZOOM)
{
static const char *choices[] =
static const wxChar *choices[] =
{
"10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%",
"60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%",
"120%", "150%", "200%"
wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"),
wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"),
wxT("120%"), wxT("150%"), wxT("200%")
};
int n = WXSIZEOF(choices);
@@ -505,9 +504,9 @@ void wxPreviewControlBar::CreateButtons()
void wxPreviewControlBar::SetZoomControl(int zoom)
{
char buf[20];
sprintf(buf, "%d%%", zoom);
// Someone is calling methods that do no exist in wxChoice!! So I'll just comment out for VA for now
wxChar buf[20];
wxSprintf( buf, wxT("%d%%"), zoom );
if (m_zoomControl)
m_zoomControl->SetStringSelection(buf);
}