projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the correct dll export macros
[wxWidgets.git]
/
include
/
wx
/
os2
/
colour.h
diff --git
a/include/wx/os2/colour.h
b/include/wx/os2/colour.h
index 807d673645cf184b91ddc7389524ce52e2063555..e1d44c1c83e122224c8e9cba7c4210b8f3ce61e0 100644
(file)
--- a/
include/wx/os2/colour.h
+++ b/
include/wx/os2/colour.h
@@
-15,14
+15,11
@@
#include "wx/object.h"
// Colour
#include "wx/object.h"
// Colour
-class WXDLL
EXPORT
wxColour: public wxColourBase
+class WXDLL
IMPEXP_CORE
wxColour: public wxColourBase
{
public:
// constructors
// ------------
{
public:
// constructors
// ------------
-
- // default
- wxColour() { Init(); }
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
// Copy ctors and assignment operators
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
// Copy ctors and assignment operators
@@
-31,10
+28,10
@@
public:
wxColour&operator = (const wxColour& rCol);
// Dtor
wxColour&operator = (const wxColour& rCol);
// Dtor
- ~wxColour();
+
virtual
~wxColour();
// Accessors
// Accessors
-
bool Ok(void) const {
return m_bIsInit; }
+
virtual bool IsOk(void) const {
return m_bIsInit; }
unsigned char Red(void) const { return m_cRed; }
unsigned char Green(void) const { return m_cGreen; }
unsigned char Red(void) const { return m_cRed; }
unsigned char Green(void) const { return m_cGreen; }
@@
-65,7
+62,8
@@
private:
unsigned char m_cBlue;
unsigned char m_cGreen;
unsigned char m_cBlue;
unsigned char m_cGreen;
- virtual void InitWith( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
+ virtual void
+ InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
public:
WXCOLORREF m_vPixel ;
public:
WXCOLORREF m_vPixel ;