Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index 838cc7413ba7e7b7a306ea91c15c5a71773ed931..684ee92aa67035410c052b9987a5265875be0c44 100644 (file)
--- a/src/os2/button.cpp
+++ b/src/os2/button.cpp
@@ -39,8 +39,6 @@
 #define BST_CHECKED 0x0001
 #endif
 
 #define BST_CHECKED 0x0001
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-

 // Button
 
 bool wxButton::Create( wxWindow*          pParent,
 // Button
 
 bool wxButton::Create( wxWindow*          pParent,


@@ -80,7 +78,7 @@ bool wxButton::Create( wxWindow*          pParent,
 
     m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)   // Parent handle
                                        ,WC_BUTTON            // A Button class window
 
     m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)   // Parent handle
                                        ,WC_BUTTON            // A Button class window

-                                       ,(PSZ)sLabel.c_str()  // Button text
+                                       ,sLabel.c_str()  // Button text

                                        ,lStyle               // Button style
                                        ,0, 0, 0, 0           // Location and size
                                        ,GetHwndOf(pParent)   // Owner handle
                                        ,lStyle               // Button style
                                        ,0, 0, 0, 0           // Location and size
                                        ,GetHwndOf(pParent)   // Owner handle


@@ -231,26 +229,24 @@ bool wxButton::SendClickEvent()
     return ProcessCommand(vEvent);
 } // end of wxButton::SendClickEvent
 
     return ProcessCommand(vEvent);
 } // end of wxButton::SendClickEvent
 

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

 {
 {

-    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-
-    wxCHECK_RET( tlw, _T("button without top level window?") );
-

     //
     // 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 = tlw->SetDefaultItem(this);
+    wxWindow* pWinOldDefault = wxButtonBase::SetDefault();

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

+
+    return pWinOldDefault;

 } // end of wxButton::SetDefault
 
 void wxButton::SetTmpDefault()
 {
     wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
 
 } // end of wxButton::SetDefault
 
 void wxButton::SetTmpDefault()
 {
     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();
 


@@ -263,7 +259,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);
 


@@ -385,7 +381,7 @@ WXDWORD wxButton::OS2GetStyle(
 
     //
     // We must use WS_CLIPSIBLINGS with the buttons or they would draw over
 
     //
     // We must use WS_CLIPSIBLINGS with the buttons or they would draw over

-    // each other in any resizeable dialog which has more than one button in
+    // each other in any resizable dialog which has more than one button in

     // the bottom
     //
     dwStyle |= WS_CLIPSIBLINGS;
     // the bottom
     //
     dwStyle |= WS_CLIPSIBLINGS;