Commit patch [ 1559950 ] fix mem leaks in wx{Dir|File}Dialog

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

diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index 1cc7b3e3a1280a6a1539ff475d696631d250e86c..32c0d39b78a3236fc1b4285e0d0008972601d38a 100644 (file)
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.cpp
+// Name:        src/motif/colour.cpp
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 //// TODO: make wxColour a ref-counted object,
@@ -15,9 +15,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/gdicmn.h"
 #include "wx/colour.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/gdicmn.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -42,11 +45,6 @@ void wxColour::Init()
     m_pixel = -1;
 }
 
-wxColour::wxColour()
-{
-    Init();
-}
-
 wxColour::wxColour(const wxColour& col)
 {
     *this = col;
@@ -62,47 +60,12 @@ wxColour& wxColour::operator =(const wxColour& col)
     return *this;
 }
 
-void wxColour::InitFromName(const wxString& name)
-{
-    if ( wxTheColourDatabase )
-    {
-        wxColour col = wxTheColourDatabase->Find(name);
-        if ( col.Ok() )
-        {
-            *this = col;
-            return;
-        }
-    }
-
-    // leave invalid
-    Init();
-}
-
-/* static */
-wxColour wxColour::CreateByName(const wxString& name)
-{
-    wxColour col;
-
-    Display *dpy = wxGlobalDisplay();
-    WXColormap colormap = wxTheApp->GetMainColormap( dpy );
-    XColor xcol;
-    if ( XParseColor( dpy, (Colormap)colormap, name.mb_str(), &xcol ) )
-    {
-        col.m_red = xcol.red & 0xff;
-        col.m_green = xcol.green & 0xff;
-        col.m_blue = xcol.blue & 0xff;
-        col.m_isInit = true;
-        col.m_pixel = -1;
-    }
-
-    return col;
-}
-
 wxColour::~wxColour()
 {
 }
 
-void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
+                        unsigned char WXUNUSED(a))
 {
     m_red = r;
     m_green = g;
@@ -126,11 +89,11 @@ int wxColour::AllocColour(WXDisplay* display, bool realloc)
 
     XColor color;
     color.red = (unsigned short) Red ();
-    color.red |= color.red << 8;
+    color.red |= (unsigned short)(color.red << 8);
     color.green = (unsigned short) Green ();
-    color.green |= color.green << 8;
+    color.green |= (unsigned short)(color.green << 8);
     color.blue = (unsigned short) Blue ();
-    color.blue |= color.blue << 8;
+    color.blue |= (unsigned short)(color.blue << 8);
 
     color.flags = DoRed | DoGreen | DoBlue;