From: Václav Slavík Date: Thu, 10 Aug 2006 11:16:30 +0000 (+0000) Subject: moved mgl/colour.{cpp,h} to generic so that it can be reused by other ports without... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3da12c22f2e9014d7fd2f4fa63255709befe3a95 moved mgl/colour.{cpp,h} to generic so that it can be reused by other ports without native colour representation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index f3ce41d226..e0563e5494 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1716,6 +1716,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR = \ @COND_TOOLKIT_MAC@LOWLEVEL_HDR = COND_TOOLKIT_MGL_LOWLEVEL_HDR = \ wx/generic/caret.h \ + wx/generic/colour.h \ wx/generic/icon.h \ wx/generic/timer.h \ wx/mgl/app.h \ @@ -1723,7 +1724,6 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR = \ wx/mgl/brush.h \ wx/mgl/chkconf.h \ wx/mgl/clipbrd.h \ - wx/mgl/colour.h \ wx/mgl/cursor.h \ wx/mgl/dc.h \ wx/mgl/dcclient.h \ @@ -3609,13 +3609,13 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = $(__MAC_LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS = \ monodll_caret.o \ + monodll_colour.o \ monodll_icon.o \ monodll_timer.o \ monodll_app.o \ monodll_bitmap.o \ monodll_brush.o \ monodll_clipbrd.o \ - monodll_colour.o \ monodll_cursor.o \ monodll_data.o \ monodll_dc.o \ @@ -4408,13 +4408,13 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_1 = $(__MAC_LOWLEVEL_SRC_OBJECTS) COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_caret.o \ + monodll_colour.o \ monodll_icon.o \ monodll_timer.o \ monodll_app.o \ monodll_bitmap.o \ monodll_brush.o \ monodll_clipbrd.o \ - monodll_colour.o \ monodll_cursor.o \ monodll_data.o \ monodll_dc.o \ @@ -5272,13 +5272,13 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \ @COND_TOOLKIT_MAC@ $(__MAC_LOWLEVEL_SRC_OBJECTS_0) COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_caret.o \ + monolib_colour.o \ monolib_icon.o \ monolib_timer.o \ monolib_app.o \ monolib_bitmap.o \ monolib_brush.o \ monolib_clipbrd.o \ - monolib_colour.o \ monolib_cursor.o \ monolib_data.o \ monolib_dc.o \ @@ -6072,13 +6072,13 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MAC@ $(__MAC_LOWLEVEL_SRC_OBJECTS_0) COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_caret.o \ + monolib_colour.o \ monolib_icon.o \ monolib_timer.o \ monolib_app.o \ monolib_bitmap.o \ monolib_brush.o \ monolib_clipbrd.o \ - monolib_colour.o \ monolib_cursor.o \ monolib_data.o \ monolib_dc.o \ @@ -7153,13 +7153,13 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \ @COND_TOOLKIT_MAC@ $(__MAC_LOWLEVEL_SRC_OBJECTS_8) COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_caret.o \ + coredll_colour.o \ coredll_icon.o \ coredll_timer.o \ coredll_app.o \ coredll_bitmap.o \ coredll_brush.o \ coredll_clipbrd.o \ - coredll_colour.o \ coredll_cursor.o \ coredll_data.o \ coredll_dc.o \ @@ -7953,13 +7953,13 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \ @COND_TOOLKIT_MAC@ $(__MAC_LOWLEVEL_SRC_OBJECTS_8) COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_caret.o \ + coredll_colour.o \ coredll_icon.o \ coredll_timer.o \ coredll_app.o \ coredll_bitmap.o \ coredll_brush.o \ coredll_clipbrd.o \ - coredll_colour.o \ coredll_cursor.o \ coredll_data.o \ coredll_dc.o \ @@ -8512,13 +8512,13 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \ @COND_TOOLKIT_MAC@ $(__MAC_LOWLEVEL_SRC_OBJECTS_9) COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_caret.o \ + corelib_colour.o \ corelib_icon.o \ corelib_timer.o \ corelib_app.o \ corelib_bitmap.o \ corelib_brush.o \ corelib_clipbrd.o \ - corelib_colour.o \ corelib_cursor.o \ corelib_data.o \ corelib_dc.o \ @@ -9312,13 +9312,13 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \ @COND_TOOLKIT_MAC@ $(__MAC_LOWLEVEL_SRC_OBJECTS_9) COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_caret.o \ + corelib_colour.o \ corelib_icon.o \ corelib_timer.o \ corelib_app.o \ corelib_bitmap.o \ corelib_brush.o \ corelib_clipbrd.o \ - corelib_colour.o \ corelib_cursor.o \ corelib_data.o \ corelib_dc.o \ @@ -12942,8 +12942,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_colour.o: $(srcdir)/src/x11/colour.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp -@COND_TOOLKIT_MGL_USE_GUI_1@monodll_colour.o: $(srcdir)/src/mgl/colour.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/colour.cpp +@COND_TOOLKIT_MGL_USE_GUI_1@monodll_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/motif/colour.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp @@ -16824,8 +16824,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_colour.o: $(srcdir)/src/x11/colour.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp -@COND_TOOLKIT_MGL_USE_GUI_1@monolib_colour.o: $(srcdir)/src/mgl/colour.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/colour.cpp +@COND_TOOLKIT_MGL_USE_GUI_1@monolib_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/motif/colour.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp @@ -21084,8 +21084,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@coredll_colour.o: $(srcdir)/src/x11/colour.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp -@COND_TOOLKIT_MGL_USE_GUI_1@coredll_colour.o: $(srcdir)/src/mgl/colour.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/colour.cpp +@COND_TOOLKIT_MGL_USE_GUI_1@coredll_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/motif/colour.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp @@ -23904,8 +23904,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@corelib_colour.o: $(srcdir)/src/x11/colour.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp -@COND_TOOLKIT_MGL_USE_GUI_1@corelib_colour.o: $(srcdir)/src/mgl/colour.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/colour.cpp +@COND_TOOLKIT_MGL_USE_GUI_1@corelib_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/motif/colour.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 2f6bdbf468..b6e0335b80 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1722,13 +1722,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/caret.cpp + src/generic/colour.cpp src/generic/icon.cpp src/generic/timer.cpp src/mgl/app.cpp src/mgl/bitmap.cpp src/mgl/brush.cpp src/mgl/clipbrd.cpp - src/mgl/colour.cpp src/mgl/cursor.cpp src/mgl/data.cpp src/mgl/dc.cpp @@ -1751,6 +1751,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/caret.h + wx/generic/colour.h wx/generic/icon.h wx/generic/timer.h wx/mgl/app.h @@ -1758,7 +1759,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/mgl/brush.h wx/mgl/chkconf.h wx/mgl/clipbrd.h - wx/mgl/colour.h wx/mgl/cursor.h wx/mgl/dc.h wx/mgl/dcclient.h diff --git a/include/wx/colour.h b/include/wx/colour.h index df13b09baf..509dc74405 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -114,7 +114,7 @@ public: #elif defined(__WXGTK__) #include "wx/gtk1/colour.h" #elif defined(__WXMGL__) -#include "wx/mgl/colour.h" +#include "wx/generic/colour.h" #elif defined(__WXX11__) #include "wx/x11/colour.h" #elif defined(__WXMAC__) diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h new file mode 100644 index 0000000000..04e3645254 --- /dev/null +++ b/include/wx/generic/colour.h @@ -0,0 +1,70 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/generic/colour.h +// Purpose: wxColour class +// Author: Julian Smart +// Modified by: +// Created: 01/02/97 +// RCS-ID: $Id$ +// Copyright: (c) Julian Smart +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GENERIC_COLOUR_H_ +#define _WX_GENERIC_COLOUR_H_ + +#include "wx/object.h" + +// Colour +class WXDLLEXPORT wxColour: public wxColourBase +{ +public: + // constructors + // ------------ + + // default + wxColour(); + DEFINE_STD_WXCOLOUR_CONSTRUCTORS + + // copy ctors and assignment operators + wxColour(const wxColour& col); + wxColour& operator = (const wxColour& col); + + // dtor + ~wxColour(); + + // accessors + bool Ok() const { return m_isInit; } + + unsigned char Red() const { return m_red; } + unsigned char Green() const { return m_green; } + unsigned char Blue() const { return m_blue; } + + // comparison + bool operator == (const wxColour& colour) const + { + return (m_red == colour.m_red && + m_green == colour.m_green && + m_blue == colour.m_blue && + m_isInit == colour.m_isInit); + } + bool operator != (const wxColour& colour) const { return !(*this == colour); } + + +protected: + + // Helper function + void Init(); + + virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue); + +private: + bool m_isInit; + unsigned char m_red; + unsigned char m_blue; + unsigned char m_green; + +private: + DECLARE_DYNAMIC_CLASS(wxColour) +}; + +#endif // _WX_GENERIC_COLOUR_H_ diff --git a/include/wx/mgl/colour.h b/include/wx/mgl/colour.h deleted file mode 100644 index 892509205e..0000000000 --- a/include/wx/mgl/colour.h +++ /dev/null @@ -1,71 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/mgl/colour.h -// Purpose: wxColour class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLOUR_H_ -#define _WX_COLOUR_H_ - -#include "wx/object.h" - -// Colour -class WXDLLEXPORT wxColour: public wxColourBase -{ -public: - // constructors - // ------------ - - // default - wxColour(); - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - // copy ctors and assignment operators - wxColour(const wxColour& col); - wxColour& operator = (const wxColour& col); - - // dtor - ~wxColour(); - - // accessors - bool Ok() const { return m_isInit; } - - unsigned char Red() const { return m_red; } - unsigned char Green() const { return m_green; } - unsigned char Blue() const { return m_blue; } - - // comparison - bool operator == (const wxColour& colour) const - { - return (m_red == colour.m_red && - m_green == colour.m_green && - m_blue == colour.m_blue && - m_isInit == colour.m_isInit); - } - bool operator != (const wxColour& colour) const { return !(*this == colour); } - - -protected: - - // Helper function - void Init(); - - virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue); - -private: - bool m_isInit; - unsigned char m_red; - unsigned char m_blue; - unsigned char m_green; - -private: - DECLARE_DYNAMIC_CLASS(wxColour) -}; - -#endif - // _WX_COLOUR_H_ diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp new file mode 100644 index 0000000000..e9bccfc59f --- /dev/null +++ b/src/generic/colour.cpp @@ -0,0 +1,66 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/generic/colour.cpp +// Purpose: wxColour class +// Author: Julian Smart +// Modified by: +// Created: 01/02/97 +// RCS-ID: $Id$ +// Copyright: (c) Julian Smart +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" +#endif + +IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) + +// Colour + +void wxColour::Init() +{ + m_red = + m_blue = + m_green = 0; + m_isInit = false; +} + +wxColour::wxColour() +{ + Init(); +} + +wxColour::wxColour(const wxColour& col) +{ + *this = col; +} + +wxColour& wxColour::operator =(const wxColour& col) +{ + m_red = col.m_red; + m_green = col.m_green; + m_blue = col.m_blue; + m_isInit = col.m_isInit; + return *this; +} + +wxColour::~wxColour() +{ +} + +void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b) +{ + m_red = r; + m_green = g; + m_blue = b; + m_isInit = true; +} diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp deleted file mode 100644 index f4f2726879..0000000000 --- a/src/mgl/colour.cpp +++ /dev/null @@ -1,66 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/mgl/colour.cpp -// Purpose: wxColour class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/colour.h" - -#ifndef WX_PRECOMP - #include "wx/gdicmn.h" -#endif - -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) - -// Colour - -void wxColour::Init() -{ - m_red = - m_blue = - m_green = 0; - m_isInit = false; -} - -wxColour::wxColour() -{ - Init(); -} - -wxColour::wxColour(const wxColour& col) -{ - *this = col; -} - -wxColour& wxColour::operator =(const wxColour& col) -{ - m_red = col.m_red; - m_green = col.m_green; - m_blue = col.m_blue; - m_isInit = col.m_isInit; - return *this; -} - -wxColour::~wxColour() -{ -} - -void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b) -{ - m_red = r; - m_green = g; - m_blue = b; - m_isInit = true; -}