added WXTRACE env. variable

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index b2f4037d0ee0468160dabd288c1e339242a7ce7e..d0a7035d95e80243e073812806ab805a3b8a5106 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -226,7 +226,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
     parent->AddChild(this);
 
 
     parent->AddChild(this);
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     m_foregroundColour = *wxBLACK;
 
     //// TODO: we should probably optimize by only creating a
     m_foregroundColour = *wxBLACK;
 
     //// TODO: we should probably optimize by only creating a


@@ -357,7 +357,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
     // Scrolled widget needs to have its colour changed or we get a little blue
     // square where the scrollbars abutt
 
     // Scrolled widget needs to have its colour changed or we get a little blue
     // square where the scrollbars abutt

-    wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
     DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
 
     DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
     DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
 


@@ -376,7 +376,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);

-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

     SetSize(pos.x, pos.y, size.x, size.y);
 
     return TRUE;
     SetSize(pos.x, pos.y, size.x, size.y);
 
     return TRUE;


@@ -509,7 +509,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
 
         m_hScrollBar = (WXWidget) hScrollBar;
 
 
         m_hScrollBar = (WXWidget) hScrollBar;
 

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

         DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(hScrollBar);
         DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(hScrollBar);


@@ -544,7 +544,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             NULL);
 
         m_vScrollBar = (WXWidget) vScrollBar;
             NULL);
 
         m_vScrollBar = (WXWidget) vScrollBar;

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

         DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(vScrollBar);
         DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(vScrollBar);


@@ -713,7 +713,7 @@ wxString wxWindow::GetTitle() const
     return wxString(title);
 }
 
     return wxString(title);
 }
 

-void wxWindow::CaptureMouse()
+void wxWindow::DoCaptureMouse()

 {
     g_captureWindow = this;
     if ( m_winCaptured )
 {
     g_captureWindow = this;
     if ( m_winCaptured )


@@ -726,7 +726,7 @@ void wxWindow::CaptureMouse()
     m_winCaptured = TRUE;
 }
 
     m_winCaptured = TRUE;
 }
 

-void wxWindow::ReleaseMouse()
+void wxWindow::DoReleaseMouse()

 {
     g_captureWindow = NULL;
     if ( !m_winCaptured )
 {
     g_captureWindow = NULL;
     if ( !m_winCaptured )


@@ -2870,7 +2870,7 @@ void wxWindow::ChangeBackgroundColour()
         DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour);
         // Have to set the scrollbar colours back since
         // the scrolled window seemed to change them
         DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour);
         // Have to set the scrollbar colours back since
         // the scrolled window seemed to change them

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

 
         if (m_hScrollBar)
             DoChangeBackgroundColour(m_hScrollBar, backgroundColour);
 
         if (m_hScrollBar)
             DoChangeBackgroundColour(m_hScrollBar, backgroundColour);