Fixed to use wxNcPaintEvent types where needed

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

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 9790eb6ca90913ecb9f533b07d6a1c283a00958d..e446186e1f6c55bde7476dabab3edfb659f9bf2a 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -158,7 +158,7 @@ protected:
     void Init();
 
     void RefreshTitleBar();
-    void OnNcPaint(wxPaintEvent& event);
+    void OnNcPaint(wxNcPaintEvent& event);
     void OnSystemMenu(wxCommandEvent& event);
 
     // TRUE if wxTLW should render decorations (aka titlebar) itself

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 01115c15f335e2b79bf1bddf4d5a9eecf5a57864..a01a6e29b46172e6702a133cf33a7175c551fcbf 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -206,7 +206,7 @@ protected:
 
     // event handlers
     void OnSize(wxSizeEvent& event);
-    void OnNcPaint(wxPaintEvent& event);
+    void OnNcPaint(wxNcPaintEvent& event);
     void OnPaint(wxPaintEvent& event);
     void OnErase(wxEraseEvent& event);
 

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index 0ac5717db0d424386391e47cb71699fda45308a2..dea87cf2f57191bb03c0865c44c1035d6f4acae9 100644 (file)
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -238,7 +238,7 @@ void wxTopLevelWindow::DoSetClientSize(int width, int height)
         wxTopLevelWindowNative::DoSetClientSize(width, height);
 }
 
-void wxTopLevelWindow::OnNcPaint(wxPaintEvent& event)
+void wxTopLevelWindow::OnNcPaint(wxNcPaintEvent& event)
 {
     if ( !ms_drawDecorations || !m_renderer )
         event.Skip();

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 4de62140fcde70049e1d6941c4a3e54063871600..2a5b246c932ae2936ea21d8b46829291beb5e3e9 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -211,7 +211,7 @@ const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
 // ----------------------------------------------------------------------------
 
 // the event handlers executed when the window must be repainted
-void wxWindow::OnNcPaint(wxPaintEvent& WXUNUSED(event))
+void wxWindow::OnNcPaint(wxNcPaintEvent& WXUNUSED(event))
 {
     if ( m_renderer )
     {