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

made controls sample compile in unicode mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-04-23 10:38:58 +00:00
parent 8e360a085f
commit f70d582977
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
samples/controls/controls.cpp
View File

@@ -228,7 +228,7 @@ void MyTextCtrl::OnChar(wxKeyEvent& event)
s_repeatCount = 1; s_repeatCount = 1;
} }
wxLogStatus("Key event: %d (x%u), at position %ld", wxLogStatus( _T("Key event: %d (x%u), at position %ld"),
s_keycode, s_repeatCount, GetInsertionPoint()); s_keycode, s_repeatCount, GetInsertionPoint());
event.Skip(); event.Skip();
@@ -244,11 +244,11 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
long line, column, pos = GetInsertionPoint(); long line, column, pos = GetInsertionPoint();
PositionToXY(pos, &column, &line); PositionToXY(pos, &column, &line);
wxLogMessage("Current position: %ld\n" wxLogMessage( _T("Current position: %ld\n"
"Current line, column: (%ld, %ld)\n" "Current line, column: (%ld, %ld)\n"
"Number of lines: %ld\n" "Number of lines: %ld\n"
"Current line length: %ld\n" "Current line length: %ld\n"
"Total text length: %ld", "Total text length: %ld"),
pos, pos,
line, column, line, column,
GetNumberOfLines(), GetNumberOfLines(),
@@ -909,10 +909,10 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
void MyPanel::OnSpinUpdate( wxSpinEvent &event ) void MyPanel::OnSpinUpdate( wxSpinEvent &event )
{ {
wxString value; wxString value;
value.Printf( "%d", event.GetPosition() ); value.Printf( _T("%d"), event.GetPosition() );
m_spintext->SetValue( value ); m_spintext->SetValue( value );
value.Printf("Spin control range: (%d, %d), current = %d\n", value.Printf( _T("Spin control range: (%d, %d), current = %d\n"),
m_spinbutton->GetMin(), m_spinbutton->GetMax(), m_spinbutton->GetMin(), m_spinbutton->GetMax(),
m_spinbutton->GetValue()); m_spinbutton->GetValue());
@@ -969,7 +969,7 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
static long s_delay = 5000; static long s_delay = 5000;
wxString delay; wxString delay;
delay.Printf("%ld", s_delay); delay.Printf( _T("%ld"), s_delay);
delay = wxGetTextFromUser("Enter delay (in milliseconds)", delay = wxGetTextFromUser("Enter delay (in milliseconds)",
"Set tooltip delay", "Set tooltip delay",
@@ -978,11 +978,11 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
if ( !delay ) if ( !delay )
return; // cancelled return; // cancelled
sscanf(delay, "%ld", &s_delay); wxSscanf(delay, _T("%ld"), &s_delay);
wxToolTip::SetDelay(s_delay); wxToolTip::SetDelay(s_delay);
wxLogStatus(this, "Tooltip delay set to %ld milliseconds", s_delay); wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
} }
void MyFrame::OnToggleTooltips(wxCommandEvent& event) void MyFrame::OnToggleTooltips(wxCommandEvent& event)
@@ -993,14 +993,14 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event)
wxToolTip::Enable(s_enabled); wxToolTip::Enable(s_enabled);
wxLogStatus(this, "Tooltips %sabled", s_enabled ? "en" : "dis"); wxLogStatus(this, _T("Tooltips %sabled"), s_enabled ? _T("en") : _T("dis") );
} }
#endif // tooltips #endif // tooltips
void MyFrame::OnSize( wxSizeEvent& event ) void MyFrame::OnSize( wxSizeEvent& event )
{ {
wxString msg; wxString msg;
msg.Printf("%dx%d", event.GetSize().x, event.GetSize().y); msg.Printf( _("%dx%d"), event.GetSize().x, event.GetSize().y);
SetStatusText(msg, 1); SetStatusText(msg, 1);
event.Skip(); event.Skip();
@@ -1016,14 +1016,16 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
s_windowFocus = focus; s_windowFocus = focus;
wxString msg; wxString msg;
msg.Printf("Focus: wxWindow = %p" msg.Printf(
#ifdef __WXMSW__ #ifdef __WXMSW__
", HWND = %08x" _T("Focus: wxWindow = %p, HWND = %08x"),
#endif // wxMSW #else
, s_windowFocus _T("Focus: wxWindow = %p"),
#endif
s_windowFocus
#ifdef __WXMSW__ #ifdef __WXMSW__
, s_windowFocus->GetHWND() , s_windowFocus->GetHWND()
#endif // wxMSW #endif
); );
SetStatusText(msg); SetStatusText(msg);