Win16 compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-16 21:29:54 +00:00
parent b4d1ebf058
commit 8f177c8e73
24 changed files with 798 additions and 450 deletions

View File

@@ -6,7 +6,7 @@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COLOUR_H_
@@ -75,8 +75,11 @@ public:
WXCOLORREF GetPixel() const { return m_pixel; };
public:
WXCOLORREF m_pixel;
private:
bool m_isInit;
bool m_isInit;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
@@ -84,12 +87,9 @@ private:
// helper func
void InitFromName(const wxString& colourName);
public:
WXCOLORREF m_pixel ;
private:
DECLARE_DYNAMIC_CLASS(wxColour)
};
#endif
// _WX_COLOUR_H_
// _WX_COLOUR_H_