fix WXDLLIMPEXP_STC definition when building all wx libraries as DLLs (patch 1704527)

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 1f5d60838ad53510fad0e8d20c54913632548287..f43c5b0349e3eb19502960138d88b7122e325a8d 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -34,6 +34,7 @@
 
 #include "wx/apptrait.h"
 #include "wx/evtloop.h"
 
 #include "wx/apptrait.h"
 #include "wx/evtloop.h"

+#include "wx/motif/private/timer.h"

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -135,6 +136,11 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
     return wxPORT_MOTIF;
 }
 
     return wxPORT_MOTIF;
 }
 

+wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer* timer)
+{
+    return new wxMotifTimerImpl(timer);
+}
+

 // ----------------------------------------------------------------------------
 // display info
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // display info
 // ----------------------------------------------------------------------------


@@ -524,6 +530,9 @@ XmString wxFindAcceleratorText (const char *s)
 // Change a widget's foreground and background colours.
 void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 {
 // Change a widget's foreground and background colours.
 void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 {

+    if (!foregroundColour.Ok())
+        return;
+

     // When should we specify the foreground, if it's calculated
     // by wxComputeColours?
     // Solution: say we start with the default (computed) foreground colour.
     // When should we specify the foreground, if it's calculated
     // by wxComputeColours?
     // Solution: say we start with the default (computed) foreground colour.


@@ -540,6 +549,9 @@ void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 
 void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColour, bool changeArmColour)
 {
 
 void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColour, bool changeArmColour)
 {

+    if (!backgroundColour.Ok())
+        return;
+

     wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
         (wxColour*) NULL);
 
     wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
         (wxColour*) NULL);