From 484ff0e456aa36d51d0b2c4aa9351060aba18acc Mon Sep 17 00:00:00 2001 From: cozman Date: Sun, 20 Jul 2003 03:21:21 +0000 Subject: [PATCH] linux source changes, from atani --- include/GewiContainer.h | 4 ++-- include/GewiDefines.h | 2 +- include/GewiIncludes.h | 2 +- test/gewiTest00.cpp | 2 +- vc7/gewitest.vcproj | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/GewiContainer.h b/include/GewiContainer.h index a6a8463..0721ba8 100755 --- a/include/GewiContainer.h +++ b/include/GewiContainer.h @@ -13,7 +13,7 @@ \brief Definition file for GContainer. Definition file for GContainer, a barebones widget that can contain child widgets. -
$Id: GewiContainer.h,v 1.6 2003/06/09 03:28:59 cozman Exp $
+
$Id: GewiContainer.h,v 1.7 2003/07/20 03:21:21 cozman Exp $
\author James Turk **/ @@ -40,7 +40,7 @@ class GContainer : public GWidget reduce encapsulation. (For those keeping score, this is to many people the only effective use of friend.) **/ - friend GWidget; + friend class Gewi::GWidget; protected: //! List of child widgets assigned to this container. diff --git a/include/GewiDefines.h b/include/GewiDefines.h index 5a1c0d8..abbe1cc 100755 --- a/include/GewiDefines.h +++ b/include/GewiDefines.h @@ -64,4 +64,4 @@ enum _GewiJustify }; -#endif //__gewidefines_h__ \ No newline at end of file +#endif //__gewidefines_h__ diff --git a/include/GewiIncludes.h b/include/GewiIncludes.h index c3d09d1..bae5dc8 100755 --- a/include/GewiIncludes.h +++ b/include/GewiIncludes.h @@ -27,4 +27,4 @@ #include "ZEngine.h" #include "GewiDefines.h" -#endif //__gewiincludes_h__ \ No newline at end of file +#endif //__gewiincludes_h__ diff --git a/test/gewiTest00.cpp b/test/gewiTest00.cpp index de765d8..52d8eea 100755 --- a/test/gewiTest00.cpp +++ b/test/gewiTest00.cpp @@ -120,4 +120,4 @@ int main(int argc, char *argv[]) ZEngine::ReleaseInstance(); return 0; -} \ No newline at end of file +} diff --git a/vc7/gewitest.vcproj b/vc7/gewitest.vcproj index 2eb7180..d1b595e 100755 --- a/vc7/gewitest.vcproj +++ b/vc7/gewitest.vcproj @@ -38,7 +38,6 @@ SDLmain.lib OpenGL32.lib SDL_mixer.lib -SDL_net.lib SDL_image.lib SDL_ttf.lib ZEngineS.lib