fixed DLL linking of wxConvLibc etc.

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

diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index 72fecad2e7d6b4369f11dbe67444da6c06e4e8d4..d1add0c9c3e7fb9c3dc25c8f361acf00dc8de09f 100644 (file)
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.cpp
+// Name:        src/os2/colour.cpp

 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:


@@ -12,16 +12,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/colour.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/colour.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"

 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)

 
 // Colour
 
 
 // Colour
 


@@ -37,25 +38,12 @@ wxColour::wxColour ()
     Init();
 } // end of wxColour::wxColour
 
     Init();
 } // end of wxColour::wxColour
 

-wxColour::wxColour (
-  unsigned char                     cRed
-, unsigned char                     cGreen
-, unsigned char                     cBlue
-)
-{
-    Set(cRed, cGreen, cBlue);
-} // end of wxColour::wxColour
-
-wxColour::wxColour(
-  const wxColour&                   rCol
-)
+wxColour::wxColour( const wxColour& rCol )

 {
     *this = rCol;
 } // end of wxColour::wxColour
 
 {
     *this = rCol;
 } // end of wxColour::wxColour
 

-wxColour& wxColour::operator =(
-  const wxColour&                   rCol
-)
+wxColour& wxColour::operator= (const wxColour& rCol)

 {
     m_cRed    = rCol.m_cRed;
     m_cGreen  = rCol.m_cGreen;
 {
     m_cRed    = rCol.m_cRed;
     m_cGreen  = rCol.m_cGreen;


@@ -65,34 +53,14 @@ wxColour& wxColour::operator =(
     return *this;
 } // end of wxColour& wxColour::operator =
 
     return *this;
 } // end of wxColour& wxColour::operator =
 

-void wxColour::InitFromName(
-  const wxString&                   sCol
-)
-{
-    if ( wxTheColourDatabase )
-    {
-        wxColour col = wxTheColourDatabase->Find(sCol);
-        if ( col.Ok() )
-        {
-            *this = col;
-            return;
-        }
-    }
-
-    // leave invalid
-    Init();
-
-} // end of wxColour::InitFromName
-

 wxColour::~wxColour()
 {
 } // end of wxColour::~wxColour
 
 wxColour::~wxColour()
 {
 } // end of wxColour::~wxColour
 

-void wxColour::Set(
-  unsigned char                     cRed
-, unsigned char                     cGreen
-, unsigned char                     cBlue
-)
+void wxColour::InitRGBA( unsigned char cRed,
+                         unsigned char cGreen,
+                         unsigned char cBlue,
+                         unsigned char WXUNUSED(calpha) )

 {
     m_cRed    = cRed;
     m_cGreen  = cGreen;
 {
     m_cRed    = cRed;
     m_cGreen  = cGreen;