no message

[wxWidgets.git] / src / stubs / window.cpp

diff --git a/src/stubs/window.cpp b/src/stubs/window.cpp
index 62937732c576bf2c8e5e56a70a352142b19d56c2..1d51541d8d0ffd45441d37debcd4f72d1ef60421 100644 (file)
--- a/src/stubs/window.cpp
+++ b/src/stubs/window.cpp
@@ -31,7 +31,7 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 

-#if  USE_DRAG_AND_DROP
+#if  wxUSE_DRAG_AND_DROP

 #include "wx/dnd.h"
 #endif
 
 #include "wx/dnd.h"
 #endif
 


@@ -75,12 +75,11 @@ wxWindow::wxWindow()
     m_caretWidth = 0; m_caretHeight = 0;
     m_caretEnabled = FALSE;
     m_caretShown = FALSE;
     m_caretWidth = 0; m_caretHeight = 0;
     m_caretEnabled = FALSE;
     m_caretShown = FALSE;

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
+    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    m_defaultForegroundColour = *wxBLACK ;
-    m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;

 
 

-#if  USE_DRAG_AND_DROP
+#if  wxUSE_DRAG_AND_DROP

     m_pDropTarget = NULL;
 #endif
 }
     m_pDropTarget = NULL;
 #endif
 }


@@ -91,7 +90,7 @@ wxWindow::~wxWindow()
        // Have to delete constraints/sizer FIRST otherwise
        // sizers may try to look at deleted windows as they
        // delete themselves.
        // Have to delete constraints/sizer FIRST otherwise
        // sizers may try to look at deleted windows as they
        // delete themselves.

-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS

     DeleteRelatedConstraints();
     if (m_constraints)
     {
     DeleteRelatedConstraints();
     if (m_constraints)
     {


@@ -158,7 +157,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     m_autoLayout = FALSE;
     m_windowValidator = NULL;
 
     m_autoLayout = FALSE;
     m_windowValidator = NULL;
 

-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

     m_pDropTarget = NULL;
 #endif
 
     m_pDropTarget = NULL;
 #endif
 


@@ -185,10 +184,9 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     else
        m_windowId = id;
 
     else
        m_windowId = id;
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    m_defaultForegroundColour = *wxBLACK ;
-    m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;

 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 


@@ -250,7 +248,7 @@ wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
                return NULL;
 }
 
                return NULL;
 }
 

-#if    USE_DRAG_AND_DROP
+#if    wxUSE_DRAG_AND_DROP

 
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {
 
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {