Allow passing multi-line strings to wxDC::DrawText(), even under MSW.

[wxWidgets.git] / src / os2 / button.cpp

diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index c237d9154278d006b74361dbd56057902d346bb5..0dfafaa3b3c3bbb3b503e3700264ab59c3074e46 100644 (file)
--- a/src/os2/button.cpp
+++ b/src/os2/button.cpp
@@ -231,12 +231,12 @@ bool wxButton::SendClickEvent()
     return ProcessCommand(vEvent);
 } // end of wxButton::SendClickEvent
 
     return ProcessCommand(vEvent);
 } // end of wxButton::SendClickEvent
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
     //
     // Set this one as the default button both for wxWidgets and Windows
     //
 {
     //
     // Set this one as the default button both for wxWidgets and Windows
     //

-    wxWindow* pWinOldDefault = wxButtonBase::Set();
+    wxWindow* pWinOldDefault = wxButtonBase::SetDefault();

 
     SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false);
     SetDefaultStyle( this, true );
 
     SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false);
     SetDefaultStyle( this, true );


@@ -248,7 +248,7 @@ void wxButton::SetTmpDefault()
 {
     wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
 
 {
     wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
 

-    wxCHECK_RET( tlw, _T("button without top level window?") );
+    wxCHECK_RET( tlw, wxT("button without top level window?") );

 
     wxWindow*                       pWinOldDefault = tlw->GetDefaultItem();
 
 
     wxWindow*                       pWinOldDefault = tlw->GetDefaultItem();
 


@@ -261,7 +261,7 @@ void wxButton::UnsetTmpDefault()
 {
     wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
 
 {
     wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
 

-    wxCHECK_RET( tlw, _T("button without top level window?") );
+    wxCHECK_RET( tlw, wxT("button without top level window?") );

 
     tlw->SetTmpDefaultItem(NULL);
 
 
     tlw->SetTmpDefaultItem(NULL);