Ok -> OK; status bar typo/cast

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index b0c80bea5c851a3203b06bf3023941c119f8963d..a30052ead611555a5c5876fbc4d93ad37491891d 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -654,7 +654,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     wxBoxSizer *sizerButtons = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *sizerAll = new wxBoxSizer(wxHORIZONTAL);
 
     wxBoxSizer *sizerButtons = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *sizerAll = new wxBoxSizer(wxHORIZONTAL);
 

-    wxButton *btnOk = new wxButton(this, wxID_OK, _T("Ok"));
+    wxButton *btnOk = new wxButton(this, wxID_OK, _T("OK"));

     sizerButtons->Add(btnOk, 0, wxCENTRE|wxBOTTOM, MARGIN/2);
     m_btnDetails = new wxButton(this, wxID_MORE, _T("&Details >>"));
     sizerButtons->Add(m_btnDetails, 0, wxCENTRE|wxTOP, MARGIN/2 - 1);
     sizerButtons->Add(btnOk, 0, wxCENTRE|wxBOTTOM, MARGIN/2);
     m_btnDetails = new wxButton(this, wxID_MORE, _T("&Details >>"));
     sizerButtons->Add(m_btnDetails, 0, wxCENTRE|wxTOP, MARGIN/2 - 1);

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 9a15d4d1f7b7c21b190db47792ab59b3d2bfff80..3cb1a61dbb94f0eb8716c3b83bdb88604a03b521 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -78,7 +78,7 @@ LRESULT APIENTRY wxStatusBarProc(HWND hwnd,
         sb->MSWWindowProc(message, wParam, lParam);
     }
 
         sb->MSWWindowProc(message, wParam, lParam);
     }
 

-    return ::CallWindowProc(gs_wndprocStatBar, hwnd, message, wParam, lParam);
+    return ::CallWindowProc(CASTWNDPROC gs_wndprocStatBar, hwnd, message, wParam, lParam);

 }
 
 // ============================================================================
 }
 
 // ============================================================================