Don't define wxArrayPGProperty as std::vector in STL build.

[wxWidgets.git] / src / univ / winuniv.cpp

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index f623137eea92fe5d9c21a15b2bde49b4c91192ad..ce34052eb89b80824814e8c965078bab872eed72 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -35,21 +35,21 @@
     #include "wx/menu.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/menu.h"
     #include "wx/frame.h"
     #include "wx/log.h"

+    #include "wx/button.h"

 #endif // WX_PRECOMP
 
 #include "wx/univ/colschem.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/theme.h"
 
 #endif // WX_PRECOMP
 
 #include "wx/univ/colschem.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/theme.h"
 

+

 #if wxUSE_CARET
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
 #if wxUSE_CARET
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 

-// turn Refresh() debugging on/off
-#define WXDEBUG_REFRESH
-
-#ifndef __WXDEBUG__
-    #undef WXDEBUG_REFRESH
+#if wxDEBUG_LEVEL >= 2
+    // turn Refresh() debugging on/off
+    #define WXDEBUG_REFRESH

 #endif
 
 #if defined(WXDEBUG_REFRESH) && defined(__WXMSW__) && !defined(__WXMICROWIN__)
 #endif
 
 #if defined(WXDEBUG_REFRESH) && defined(__WXMSW__) && !defined(__WXMICROWIN__)


@@ -224,7 +224,7 @@ bool wxWindow::Create(wxWindow *parent,
 
 wxWindow::~wxWindow()
 {
 
 wxWindow::~wxWindow()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
 #if wxUSE_SCROLLBAR
     // clear pointers to scrollbar before deleting the children: they are
 
 #if wxUSE_SCROLLBAR
     // clear pointers to scrollbar before deleting the children: they are


@@ -927,7 +927,7 @@ void wxWindow::SetScrollbar(int orient,
 {
 #if wxUSE_SCROLLBAR
     wxASSERT_MSG( pageSize <= range,
 {
 #if wxUSE_SCROLLBAR
     wxASSERT_MSG( pageSize <= range,

-                    _T("page size can't be greater than range") );
+                    wxT("page size can't be greater than range") );

 
     bool hasClientSizeChanged = false;
     wxScrollBar *scrollbar = GetScrollbar(orient);
 
     bool hasClientSizeChanged = false;
     wxScrollBar *scrollbar = GetScrollbar(orient);


@@ -1145,7 +1145,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 
 wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 {
 
 wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 {

-    wxASSERT_MSG( !dx || !dy, _T("can't be used for diag scrolling") );
+    wxASSERT_MSG( !dx || !dy, wxT("can't be used for diag scrolling") );

 
     // the rect to refresh (which we will calculate)
     wxRect rect;
 
     // the rect to refresh (which we will calculate)
     wxRect rect;


@@ -1160,7 +1160,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
     // location
     wxSize sizeTotal = rectTotal ? rectTotal->GetSize() : GetClientSize();
 
     // location
     wxSize sizeTotal = rectTotal ? rectTotal->GetSize() : GetClientSize();
 

-    wxLogTrace(_T("scroll"), _T("rect is %dx%d, scroll by %d, %d"),
+    wxLogTrace(wxT("scroll"), wxT("rect is %dx%d, scroll by %d, %d"),

                sizeTotal.x, sizeTotal.y, dx, dy);
 
     // the initial and end point of the region we move in client coords
                sizeTotal.x, sizeTotal.y, dx, dy);
 
     // the initial and end point of the region we move in client coords


@@ -1178,7 +1178,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
     if ( size.x <= 0 || size.y <= 0 )
     {
         // just redraw everything as nothing of the displayed image will stay
     if ( size.x <= 0 || size.y <= 0 )
     {
         // just redraw everything as nothing of the displayed image will stay

-        wxLogTrace(_T("scroll"), _T("refreshing everything"));
+        wxLogTrace(wxT("scroll"), wxT("refreshing everything"));

 
         rect = rectTotal ? *rectTotal : wxRect(0, 0, sizeTotal.x, sizeTotal.y);
     }
 
         rect = rectTotal ? *rectTotal : wxRect(0, 0, sizeTotal.x, sizeTotal.y);
     }


@@ -1230,8 +1230,8 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
                   );
         dc.Blit(ptDest, size, &dcMem, wxPoint(0,0));
 
                   );
         dc.Blit(ptDest, size, &dcMem, wxPoint(0,0));
 

-        wxLogTrace(_T("scroll"),
-                   _T("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),
+        wxLogTrace(wxT("scroll"),
+                   wxT("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),

                    ptSource.x, ptSource.y,
                    size.x, size.y,
                    ptDest.x, ptDest.y);
                    ptSource.x, ptSource.y,
                    size.x, size.y,
                    ptDest.x, ptDest.y);


@@ -1262,7 +1262,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 
             rect.height = sizeTotal.y;
 
 
             rect.height = sizeTotal.y;
 

-            wxLogTrace(_T("scroll"), _T("refreshing (%d, %d)-(%d, %d)"),
+            wxLogTrace(wxT("scroll"), wxT("refreshing (%d, %d)-(%d, %d)"),

                        rect.x, rect.y,
                        rect.GetRight() + 1, rect.GetBottom() + 1);
         }
                        rect.x, rect.y,
                        rect.GetRight() + 1, rect.GetBottom() + 1);
         }


@@ -1283,7 +1283,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 
             rect.width = sizeTotal.x;
 
 
             rect.width = sizeTotal.x;
 

-            wxLogTrace(_T("scroll"), _T("refreshing (%d, %d)-(%d, %d)"),
+            wxLogTrace(wxT("scroll"), wxT("refreshing (%d, %d)-(%d, %d)"),

                        rect.x, rect.y,
                        rect.GetRight() + 1, rect.GetBottom() + 1);
         }
                        rect.x, rect.y,
                        rect.GetRight() + 1, rect.GetBottom() + 1);
         }