Merge lp:~michihenning/nux/1032313-series-4.0 into lp:nux

[Michi Henning]

Eliminated a whole bunch of compiler warnings reported by -Wextra.

Eliminated a whole bunch of compiler warnings reported by -Wextra. A few of these exposed real problems.
The only warnings remaining now with -Wextra are about unused parameters.

Most of the fixes are trivial, such as removing asserts that were always true, and fixing signed/unsigned comparisons.

Removed the assignment operator and copy constructor from a number of texture classes, because those derived from ObjectPtr, which is non-copyable, so these members didn't make sense. They were not called from anywhere except the Clone() methods, so I re-implemented the Clone() methods to work without a copy constructor and also change them to use covariant return types.

[Tim Penhey (thumper)]

This all makes good sense.

review: Approve

=== modified file 'Nux/Button.cpp'
--- Nux/Button.cpp	2012-07-30 04:47:08 +0000
+++ Nux/Button.cpp	2012-09-19 05:03:18 +0000
@@ -360,13 +360,6 @@
       ref_style = eBUTTON_NORMAL;
     }
 
-    const PainterImage *pimage = GetTheme().GetImage(ref_style);
-    BaseTexture* texture = NULL;
-    if (pimage != NULL)
-    {
-      texture = pimage->texture;
-    }
-
     TexCoordXForm texxform;
     ROPConfig rop;
     rop.Blend = true;

=== modified file 'Nux/ClientArea.cpp'
--- Nux/ClientArea.cpp	2012-08-31 05:58:53 +0000
+++ Nux/ClientArea.cpp	2012-09-19 05:03:18 +0000
@@ -70,9 +70,6 @@
     {
       int width = GetWidth();
       int height = GetHeight();
-      int window_width, window_height;
-      window_width = prev_viewport_.width;
-      window_height = prev_viewport_.height;
 
       m_ctx.x = GetX();
       m_ctx.y = GetY();

=== modified file 'Nux/DoubleValidator.cpp'
--- Nux/DoubleValidator.cpp	2011-10-17 21:23:50 +0000
+++ Nux/DoubleValidator.cpp	2012-09-19 05:03:18 +0000
@@ -118,9 +118,8 @@
     return d;
   }
 
-  void DoubleValidator::Alternative(const char *str)
+  void DoubleValidator::Alternative(const char * /* str */)
   {
-    str = "0.0";
   }
 
   void DoubleValidator::SetDecimals(int dec)

=== modified file 'Nux/HexRegExpValidator.cpp'
--- Nux/HexRegExpValidator.cpp	2011-10-17 21:23:50 +0000
+++ Nux/HexRegExpValidator.cpp	2012-09-19 05:03:18 +0000
@@ -117,9 +117,8 @@
     return i;
   }
 
-  void HexRegExpValidator::Alternative(const char *str)
+  void HexRegExpValidator::Alternative(const char * /* str */)
   {
-    str = "0x0";
   }
 
   NString HexRegExpValidator::ToString(int i)

=== modified file 'Nux/IntegerValidator.cpp'
--- Nux/IntegerValidator.cpp	2011-10-17 21:23:50 +0000
+++ Nux/IntegerValidator.cpp	2012-09-19 05:03:18 +0000
@@ -118,9 +118,8 @@
     return i;
   }
 
-  void IntegerValidator::Alternative(const char *str)
+  void IntegerValidator::Alternative(const char * /* str */)
   {
-    str = "0";
   }
 
   NString IntegerValidator::ToString(int i)

=== modified file 'Nux/MainLoopGLib.cpp'
--- Nux/MainLoopGLib.cpp	2012-08-07 20:39:44 +0000
+++ Nux/MainLoopGLib.cpp	2012-09-19 05:03:18 +0000
@@ -146,6 +146,8 @@
     nux_event_prepare,
     nux_event_check,
     nux_event_dispatch,
+    NULL,
+    NULL,
     NULL
   };
 
@@ -165,12 +167,17 @@
     return TRUE;
   }
 
+  static GTimeVal get_time(GSource* source)
+  {
+    gint64 t = g_source_get_time(source);               // Time in microseconds
+    return GTimeVal { t / 1000000, t % 1000000 };
+  }
+
   static gboolean nux_timeline_dispatch(GSource *source, GSourceFunc callback, gpointer user_data)
   {
-    GTimeVal time_val;
     bool has_timelines_left = false;
     nux_glib_threads_lock();
-    g_source_get_current_time(source, &time_val);
+    GTimeVal time_val = get_time(source);
     WindowThread *window_thread = NUX_STATIC_CAST(WindowThread *, user_data);
 
     // pump the timelines
@@ -192,6 +199,8 @@
     nux_timeline_prepare,
     nux_timeline_check,
     nux_timeline_dispatch,
+    NULL,
+    NULL,
     NULL
   };
 
@@ -367,7 +376,6 @@
 
     if (_MasterClock == NULL)
     {
-      GTimeVal time_val;
       // make a source for our master clock
       _MasterClock = g_source_new(&timeline_funcs, sizeof(GSource));
 
@@ -381,7 +389,7 @@
         g_source_attach(_MasterClock, main_loop_glib_context_);
 
 
-      g_get_current_time(&time_val);
+      GTimeVal time_val = get_time(_MasterClock);
       last_timeline_frame_time_sec_ = time_val.tv_sec;
       last_timeline_frame_time_usec_ = time_val.tv_usec;
     }

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-09-17 09:55:43 +0000
+++ Nux/WindowCompositor.cpp	2012-09-19 05:03:18 +0000
@@ -1534,13 +1534,6 @@
       // End 2D Drawing
     }
 
-    if (key_focus_area_.IsValid())
-    {
-      // key focus test
-      Geometry const& geo = key_focus_area_->GetRootGeometry();
-      //GetGraphicsDisplay()->GetGraphicsEngine()->QRP_Color(geo.x, geo.y, geo.width, geo.height, color::Blue);
-    }
-
     window_thread_->GetGraphicsEngine().SetOrthographicProjectionMatrix(buffer_width, buffer_height);
     m_FrameBufferObject->Deactivate();
 

=== modified file 'NuxCore/FileManager/NFileManagerGNU.cpp'
--- NuxCore/FileManager/NFileManagerGNU.cpp	2012-07-30 21:18:22 +0000
+++ NuxCore/FileManager/NFileManagerGNU.cpp	2012-09-19 05:03:18 +0000
@@ -460,7 +460,7 @@
 
     if (Flags & NSerializer::Append)
     {
-      long long Pos = lseek (FileDesc, Pos, SEEK_END);
+      long long Pos = lseek (FileDesc, 0, SEEK_END);
 
       if (Pos == -1)
       {

=== modified file 'NuxCore/Logger.cpp'
--- NuxCore/Logger.cpp	2012-03-18 21:10:06 +0000
+++ NuxCore/Logger.cpp	2012-09-19 05:03:18 +0000
@@ -20,8 +20,10 @@
  *
  */
 
+#ifdef _MSC_VER
 #pragma warning(disable: 4996)  // 'std::_Copy_impl': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators'
                                 // 'std::_Equal1': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators'
+#endif
 
 #include "NuxCore.h"
 #include "Logger.h"

=== modified file 'NuxCore/Object.h'
--- NuxCore/Object.h	2012-03-18 21:10:06 +0000
+++ NuxCore/Object.h	2012-09-19 05:03:18 +0000
@@ -28,6 +28,7 @@
 
 #include <sigc++/trackable.h>
 #include <sigc++/signal.h>
+#include <boost/utility.hpp>
 #include "ObjectType.h"
 #include "Property.h"
 #include "PropertyTraits.h"
@@ -65,7 +66,7 @@
       Trackable does not implement reference counting. It only defines the API. It is up
       to the class that inherit from Trackable to implement the reference counting.
   */
-  class Trackable: public nux::Introspectable, public sigc::trackable
+  class Trackable: public nux::Introspectable, public sigc::trackable, public boost::noncopyable
   {
   public:
     NUX_DECLARE_ROOT_OBJECT_TYPE (Trackable);
@@ -160,10 +161,6 @@
     int _heap_allocated;
 
   private:
-    // Trackable objects are not copyable.
-    Trackable (const Trackable &);
-    Trackable &operator= (const Trackable &);
-
     static std::new_handler _new_current_handler;
 
     bool _owns_the_reference;

=== modified file 'NuxCore/TextString.cpp'
--- NuxCore/TextString.cpp	2012-02-18 21:32:06 +0000
+++ NuxCore/TextString.cpp	2012-09-19 05:03:18 +0000
@@ -30,7 +30,6 @@
 //
   TCHAR *Strncpy (TCHAR *Dest, size_t Size, const TCHAR *Src, size_t MaxLen)
   {
-    nuxAssert (MaxLen >= 0);
     STRNCPY_S (Dest, Size, Src, MaxLen);
     Dest[MaxLen] = 0;
     return Dest;
@@ -150,14 +149,9 @@
 
     size_t len = StringLength (str);
 
-    if (len >= 0)
-    {
-      TCHAR *res = new TCHAR[len+1];
-      Strncpy (res, len + 1, str, len);
-      return res;
-    }
-
-    return 0;
+    TCHAR *res = new TCHAR[len+1];
+    Strncpy (res, len + 1, str, len);
+    return res;
   }
 
 //! Duplicate a null terminated ANSICHAR string using new[]. The resulting string is NULL terminated. Use delete[] to destroy.
@@ -531,7 +525,7 @@
     NString rev;
     size_t l = Length();
 
-    for (size_t i = l - 1; i >= 0; i--)
+    for (int i = l - 1; i >= 0; i--)
     {
       rev += m_string[i];
     }
@@ -757,7 +751,7 @@
 
   bool NString::IsSuffix (const TCHAR &suffix)
   {
-    size_t l = m_string.length() - 1;
+    int l = m_string.length() - 1;
 
     if (l < 0)
       return false;
@@ -767,7 +761,7 @@
     if (pos == tstring::npos)
       return false;
 
-    return (pos == l);
+    return (pos == (size_t)l);
   }
 
   bool NString::IsSuffix (const TCHAR *suffix)
@@ -777,7 +771,7 @@
     if (sl == 0)
       return false;
 
-    size_t l = m_string.length() - sl;
+    int l = m_string.length() - sl;
 
     if (l < 0)
       return false;
@@ -787,7 +781,7 @@
     if (pos == tstring::npos)
       return false;
 
-    return (pos == l);
+    return (pos == (size_t)l);
   }
 
 //! Return True is the the string is terminated by the tstring 'suffix'
@@ -798,7 +792,7 @@
     if (sl == 0)
       return false;
 
-    size_t l = m_string.length() - sl;
+    int l = m_string.length() - sl;
 
     if (l < 0)
       return false;
@@ -808,7 +802,7 @@
     if (pos == tstring::npos)
       return false;
 
-    return (pos == l);
+    return (pos == (size_t)l);
   }
 
 //! Return True is the the string is terminated by the NString 'suffix'
@@ -819,7 +813,7 @@
     if (sl == 0)
       return false;
 
-    size_t l = m_string.length() - sl;
+    int l = m_string.length() - sl;
 
     if (l < 0)
       return false;
@@ -829,13 +823,13 @@
     if (pos == tstring::npos)
       return false;
 
-    return (pos == l);
+    return (pos == (size_t)l);
   }
 
 //! Return True if the string start with the character contained in prefix
   bool NString::IsPrefix (const TCHAR &prefix)
   {
-    size_t l = m_string.length() - 1;
+    int l = m_string.length() - 1;
 
     if (l < 0)
       return false;
@@ -976,14 +970,11 @@
 
   NString NString::GetSubString (size_t count) const
   {
-    nuxAssert (count >= 0);
     return NString (m_string.substr (0, count) );
   }
 
   NString NString::GetSubString (size_t start, size_t count) const
   {
-    nuxAssert (start >= 0);
-    nuxAssert (count >= 0);
     return NString (m_string.substr (start, count) );
   }
 
@@ -1040,7 +1031,7 @@
 
   NString NString::TrimRight() const
   {
-    size_t L = Length() - 1;
+    int L = Length() - 1;
 
     while (0 <= L)
     {
@@ -1094,7 +1085,7 @@
 
   NString NString::TrimRight (NString str) const
   {
-    size_t L = Length();
+    int L = Length();
 
     if (L == 0)
       return *this;

=== modified file 'NuxGraphics/GLTextureResourceManager.cpp'
--- NuxGraphics/GLTextureResourceManager.cpp	2012-07-12 02:42:06 +0000
+++ NuxGraphics/GLTextureResourceManager.cpp	2012-09-19 05:03:18 +0000
@@ -294,30 +294,14 @@
     return GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(this);
   }
 
-  Texture2D::Texture2D(NUX_FILE_LINE_DECL)
-    : BaseTexture(NUX_FILE_LINE_PARAM)
-  {
-  }
-
-  Texture2D::Texture2D(const Texture2D& texture, NUX_FILE_LINE_DECL)
-    : BaseTexture(NUX_FILE_LINE_PARAM)
-  {
-    _image = texture._image;
+  Texture2D::Texture2D(NUX_FILE_LINE_DECL)  // TODO: Why can we create a texture without a texture?
+    : BaseTexture(NUX_FILE_LINE_PARAM)
+  {
   }
 
   Texture2D::Texture2D(const NTextureData& texture_data, NUX_FILE_LINE_DECL)
-    : BaseTexture(NUX_FILE_LINE_PARAM)
-  {
-    _image = texture_data;
-  }
-
-  Texture2D& Texture2D::operator = (const Texture2D& texture)
-  {
-    if (this == &texture)
-      return *this;   // Handle self assignment
-
-    _image = texture._image;
-    return *this;
+    : BaseTexture(NUX_FILE_LINE_PARAM), _image(texture_data)
+  {
   }
 
   Texture2D::~Texture2D()
@@ -371,10 +355,9 @@
     }
   }
 
-  BaseTexture* Texture2D::Clone() const
+  Texture2D* Texture2D::Clone() const
   {
-    Texture2D* texture = new Texture2D(*this);
-    return texture;
+    return new Texture2D(_image);
   }
 
   CachedBaseTexture::CachedBaseTexture(NResourceSet* ResourceManager)
@@ -491,23 +474,9 @@
   {
   }
 
-  TextureRectangle::TextureRectangle(const TextureRectangle& texture)
-  {
-    _image = texture._image;
-  }
-
-  TextureRectangle::TextureRectangle(const NTextureData& BaseTexture)
-  {
-    _image = BaseTexture;
-  }
-
-  TextureRectangle& TextureRectangle::operator = (const TextureRectangle& texture)
-  {
-    if (this == &texture)
-      return *this;   // Handle self assignment
-
-    _image = texture._image;
-    return *this;
+  TextureRectangle::TextureRectangle(const NTextureData& texture, NUX_FILE_LINE_DECL)
+    : BaseTexture(NUX_FILE_LINE_PARAM), _image(texture)
+  {
   }
 
   TextureRectangle::~TextureRectangle()
@@ -562,10 +531,9 @@
     }
   }
 
-  BaseTexture* TextureRectangle::Clone() const
+  TextureRectangle* TextureRectangle::Clone() const
   {
-    TextureRectangle* texture = new TextureRectangle(*this);
-    return texture;
+    return new TextureRectangle(_image);
   }
 
   CachedTextureRectangle::CachedTextureRectangle(NResourceSet* ResourceManager, TextureRectangle* SourceTexture)
@@ -638,23 +606,14 @@
     OGL_CALL(TextureRectangle->UnlockRect( MipLevel ));
   }
 
-  TextureCube::TextureCube(NUX_FILE_LINE_DECL)
+  TextureCube::TextureCube(NUX_FILE_LINE_DECL)  // TODO: why can we have a texture without a texture?
     : BaseTexture(NUX_FILE_LINE_PARAM)
   {
   }
 
-  TextureCube::TextureCube(const TextureCube& texture)
-  {
-    _image = texture._image;
-  }
-
-  TextureCube& TextureCube::operator = (const TextureCube& texture)
-  {
-    if (this == &texture)
-      return *this;   // Handle self assignment
-
-    _image = texture._image;
-    return *this;
+  TextureCube::TextureCube(const NCubemapData& Image)
+    : _image(Image)
+  {
   }
 
   TextureCube::~TextureCube()
@@ -709,10 +668,9 @@
     }
   }
 
-  BaseTexture* TextureCube::Clone() const
+  TextureCube* TextureCube::Clone() const
   {
-    TextureCube* texture = new TextureCube(*this);
-    return texture;
+    return new TextureCube(_image);
   }
 
   CachedTextureCube::CachedTextureCube(NResourceSet* ResourceManager, TextureCube* SourceTexture)
@@ -786,23 +744,14 @@
     }
   }
 
-  TextureVolume::TextureVolume(NUX_FILE_LINE_DECL)
+  TextureVolume::TextureVolume(NUX_FILE_LINE_DECL)  // TODO: why can we have a texture without a texture?
     : BaseTexture(NUX_FILE_LINE_PARAM)
   {
   }
 
-  TextureVolume::TextureVolume(const TextureVolume& texture)
-  {
-    _image = texture._image;
-  }
-
-  TextureVolume& TextureVolume::operator = (const TextureVolume& texture)
-  {
-    if (this == &texture)
-      return *this;   // Handle self assignment
-
-    _image = texture._image;
-    return *this;
+  TextureVolume::TextureVolume(const NVolumeData& Image)
+    : _image(Image)
+  {
   }
 
   TextureVolume::~TextureVolume()
@@ -878,10 +827,9 @@
 //     }
   }
 
-  BaseTexture* TextureVolume::Clone() const
+  TextureVolume* TextureVolume::Clone() const
   {
-    TextureVolume* texture = new TextureVolume(*this);
-    return texture;
+    return new TextureVolume(_image);
   }
 
   CachedTextureVolume::CachedTextureVolume(NResourceSet* ResourceManager, TextureVolume* SourceTexture)
@@ -967,23 +915,14 @@
 //     }
   }
 
-  TextureFrameAnimation::TextureFrameAnimation(NUX_FILE_LINE_DECL)
+  TextureFrameAnimation::TextureFrameAnimation(NUX_FILE_LINE_DECL) // TODO: why can we have a texture without a texture?
     : BaseTexture(NUX_FILE_LINE_PARAM)
   {
   }
 
-  TextureFrameAnimation::TextureFrameAnimation(const TextureFrameAnimation& texture)
-  {
-    _image = texture._image;
-  }
-
-  TextureFrameAnimation& TextureFrameAnimation::operator = (const TextureFrameAnimation& texture)
-  {
-    if (this == &texture)
-      return *this;   // Handle self assignment
-
-    _image = texture._image;
-    return *this;
+  TextureFrameAnimation::TextureFrameAnimation(const NAnimatedTextureData& Image)
+    : _image(Image)
+  {
   }
 
   TextureFrameAnimation::~TextureFrameAnimation()
@@ -1048,10 +987,9 @@
     return _image.GetFrameTime(Frame);
   }
 
-  BaseTexture* TextureFrameAnimation::Clone() const
+  TextureFrameAnimation* TextureFrameAnimation::Clone() const
   {
-    TextureFrameAnimation* texture = new TextureFrameAnimation(*this);
-    return texture;
+    return new TextureFrameAnimation(_image);
   }
 
   CachedTextureFrameAnimation::CachedTextureFrameAnimation(NResourceSet* ResourceManager, TextureFrameAnimation* SourceTexture)

=== modified file 'NuxGraphics/GLTextureResourceManager.h'
--- NuxGraphics/GLTextureResourceManager.h	2012-02-18 21:32:06 +0000
+++ NuxGraphics/GLTextureResourceManager.h	2012-09-19 05:03:18 +0000
@@ -145,10 +145,6 @@
     */
     virtual bool IsNull() const = 0;
 
-    /*!
-      Clone the texture.
-      @return A cloned version of this texture.
-    */
     virtual BaseTexture* Clone() const = 0;
 
     /*!
@@ -177,10 +173,8 @@
     NUX_DECLARE_OBJECT_TYPE(Texture2D, BaseTexture);
 
   public:
-    Texture2D(NUX_FILE_LINE_PROTO);
-    Texture2D(const Texture2D& texture, NUX_FILE_LINE_PROTO);
-    Texture2D(const NTextureData& BaseTexture, NUX_FILE_LINE_PROTO);
-    Texture2D& operator = (const Texture2D& texture);
+    Texture2D(NUX_FILE_LINE_PROTO); // TODO: Why can we create a texture without a texture?
+    Texture2D(const NTextureData& Image, NUX_FILE_LINE_PROTO);
     ~Texture2D();
 
     /*!
@@ -252,11 +246,7 @@
       return IsPowerOf2(_image.GetWidth()) && IsPowerOf2(_image.GetHeight());
     }
 
-    /*!
-      Clone the texture.
-      @return A cloned version of this texture.
-    */
-    virtual BaseTexture* Clone() const;
+    virtual Texture2D* Clone() const;
 
   private:
     NTextureData _image; //!< Storage for the texture data
@@ -267,10 +257,8 @@
     NUX_DECLARE_OBJECT_TYPE(TextureRectangle, BaseTexture);
 
   public:
-    TextureRectangle(NUX_FILE_LINE_PROTO);
-    TextureRectangle(const TextureRectangle& texture);
-    TextureRectangle(const NTextureData& Image);
-    TextureRectangle& operator = (const TextureRectangle& texture);
+    TextureRectangle(NUX_FILE_LINE_PROTO);        // TODO: Why can we create a texture without a texture?
+    TextureRectangle(const NTextureData& Image, NUX_FILE_LINE_PROTO);
     ~TextureRectangle();
 
     virtual bool Update(const NBitmapData* BitmapData, bool UpdateAndCacheResource = true);
@@ -326,11 +314,7 @@
       return IsPowerOf2(_image.GetWidth()) && IsPowerOf2(_image.GetHeight());
     }
 
-    /*!
-      Clone the texture.
-      @return A cloned version of this texture.
-    */
-    virtual BaseTexture* Clone() const;
+    virtual TextureRectangle* Clone() const;
 
   private:
     NTextureData _image;
@@ -341,10 +325,8 @@
     NUX_DECLARE_OBJECT_TYPE(TextureCube, BaseTexture);
 
   public:
-    TextureCube(NUX_FILE_LINE_PROTO);
-    //Texture2D(const NTextureData& Image);
-    TextureCube(const TextureCube& texture);
-    TextureCube& operator = (const TextureCube& texture);
+    TextureCube(NUX_FILE_LINE_PROTO);       // TODO: why can we have a texture without a texture?
+    TextureCube(const NCubemapData& Image);
     ~TextureCube();
 
     virtual bool Update(const NBitmapData* BitmapData, bool UpdateAndCacheResource = true);
@@ -399,11 +381,7 @@
       return IsPowerOf2(_image.GetWidth()) && IsPowerOf2(_image.GetHeight());
     }
 
-    /*!
-      Clone the texture.
-      @return A cloned version of this texture.
-    */
-    virtual BaseTexture* Clone() const;
+    virtual TextureCube* Clone() const;
 
   private:
     NCubemapData _image;
@@ -414,10 +392,8 @@
     NUX_DECLARE_OBJECT_TYPE(TextureVolume, BaseTexture);
 
   public:
-    TextureVolume(NUX_FILE_LINE_PROTO);
-    //Texture2D(const NTextureData& Image);
-    TextureVolume(const TextureVolume& texture);
-    TextureVolume& operator = (const TextureVolume& texture);
+    TextureVolume(NUX_FILE_LINE_PROTO);       // TODO: why can we have a texture without a texture?
+    TextureVolume(const NVolumeData& Image);
     ~TextureVolume();
 
     virtual bool Update(const NBitmapData* BitmapData, bool UpdateAndCacheResource = true);
@@ -481,11 +457,7 @@
       return IsPowerOf2(_image.GetWidth()) && IsPowerOf2(_image.GetHeight());
     }
 
-    /*!
-      Clone the texture.
-      @return A cloned version of this texture.
-    */
-    virtual BaseTexture* Clone() const;
+    virtual TextureVolume* Clone() const;
 
   private:
     NVolumeData _image;
@@ -496,9 +468,8 @@
     NUX_DECLARE_OBJECT_TYPE(TextureFrameAnimation, BaseTexture);
 
   public:
-    TextureFrameAnimation(NUX_FILE_LINE_PROTO);
-    TextureFrameAnimation(const TextureFrameAnimation& texture);
-    TextureFrameAnimation& operator = (const TextureFrameAnimation& texture);
+    TextureFrameAnimation(NUX_FILE_LINE_PROTO);       // TODO: why can we have a texture without a texture?
+    TextureFrameAnimation(const NAnimatedTextureData& Image);
     ~TextureFrameAnimation();
 
     virtual bool Update(const NBitmapData* BitmapData, bool UpdateAndCacheResource = true);
@@ -562,11 +533,7 @@
       return IsPowerOf2(_image.GetWidth()) && IsPowerOf2(_image.GetHeight());
     }
 
-    /*!
-      Clone the texture.
-      @return A cloned version of this texture.
-    */
-    virtual BaseTexture* Clone() const;
+    virtual TextureFrameAnimation* Clone() const;
 
   private:
     NAnimatedTextureData _image;

=== modified file 'NuxGraphics/GLVertexResourceManager.cpp'
--- NuxGraphics/GLVertexResourceManager.cpp	2012-03-12 21:59:54 +0000
+++ NuxGraphics/GLVertexResourceManager.cpp	2012-09-19 05:03:18 +0000
@@ -54,21 +54,6 @@
     Allocate(num_element, size);
   }
 
-  //! Copy constructor
-  VertexBuffer::VertexBuffer(const VertexBuffer& Other)
-  {
-    _Data = Other._Data;
-    _Stride = Other._Stride;
-  }
-
-  //! Assignment constructor
-  VertexBuffer& VertexBuffer::operator = (const VertexBuffer& Other)
-  {
-    _Data = Other._Data;
-    _Stride = Other._Stride;
-    return *this;
-  }
-
   void VertexBuffer::Allocate(int num_element, int size)
   {
     nuxAssert(num_element > 0);
@@ -135,21 +120,6 @@
     Allocate(num_element, size);
   }
 
-  //! Copy constructor
-  IndexBuffer::IndexBuffer(const IndexBuffer& Other)
-  {
-    _Data = Other._Data;
-    _Stride = Other._Stride;
-  }
-
-  //! Assignment constructor
-  IndexBuffer& IndexBuffer::operator = (const IndexBuffer& Other)
-  {
-    _Data = Other._Data;
-    _Stride = Other._Stride;
-    return *this;
-  }
-
   void IndexBuffer::Allocate(int num_index, int size)
   {
     nuxAssert(num_index > 0);

=== modified file 'NuxGraphics/GLVertexResourceManager.h'
--- NuxGraphics/GLVertexResourceManager.h	2012-01-22 04:31:33 +0000
+++ NuxGraphics/GLVertexResourceManager.h	2012-09-19 05:03:18 +0000
@@ -39,10 +39,6 @@
     VertexBuffer();
     virtual ~VertexBuffer();
     VertexBuffer(int Size, int Stride);
-    //! Copy constructor
-    VertexBuffer(const VertexBuffer&);
-    //! Assignment constructor
-    VertexBuffer& operator = (const VertexBuffer&);
 
     //! Allocate space for a "num_element", each of size "size".
     /*!
@@ -71,10 +67,6 @@
     IndexBuffer();
     virtual ~IndexBuffer();
     IndexBuffer(int Size, int Stride);
-    //! Copy constructor
-    IndexBuffer(const IndexBuffer&);
-    //! Assignment constructor
-    IndexBuffer& operator = (const IndexBuffer&);
 
     void Allocate(int Size, int Stride);
     int GetSize() const;

=== modified file 'NuxGraphics/GpuDevice.cpp'
--- NuxGraphics/GpuDevice.cpp	2012-08-28 19:05:09 +0000
+++ NuxGraphics/GpuDevice.cpp	2012-09-19 05:03:18 +0000
@@ -308,6 +308,7 @@
 #ifndef NUX_OPENGLES_20    
     // OpenGL extension initialization
     GLenum Glew_Ok = 0;
+    Glew_Ok = Glew_Ok;  // Suppress compiler warning about set but not used variable.
 #ifdef GLEW_MX
     Glew_Ok = glewContextInit(glewGetContext());
     nuxAssertMsg(Glew_Ok == GLEW_OK, "[GpuDevice::GpuDevice] GL Extensions failed to initialize.");
@@ -322,7 +323,7 @@
 
     nuxAssertMsg(Glew_Ok == GLEW_OK, "[GpuDevice::GpuDevice] OpenGL Extensions failed to initialize.");
 #else
-    Glew_Ok = glewInit();
+    glewInit();
 #endif
 #endif
 
@@ -986,12 +987,12 @@
   {
     if (GetGpuInfo().Support_ARB_Texture_Non_Power_Of_Two())
     {
-      return new Texture2D(NUX_FILE_LINE_PARAM);
+      return new Texture2D(NUX_FILE_LINE_PARAM);  // Why are we creating a texture without a texture here?
     }
 
     if (GetGpuInfo().Support_EXT_Texture_Rectangle() || GetGpuInfo().Support_ARB_Texture_Rectangle())
     {
-      return new TextureRectangle(NUX_FILE_LINE_PARAM);
+      return new TextureRectangle(NUX_FILE_LINE_PARAM);  // Why are we creating a texture without a texture here?
     }
 
     nuxAssertMsg(0, "[NuxGraphicsResources::CreateSystemCapableTexture] No support for non power of two textures or rectangle textures");

=== modified file 'NuxGraphics/GpuDeviceVertex.cpp'
--- NuxGraphics/GpuDeviceVertex.cpp	2011-10-28 03:45:14 +0000
+++ NuxGraphics/GpuDeviceVertex.cpp	2012-09-19 05:03:18 +0000
@@ -160,7 +160,7 @@
         vtxelement.Type,
         GL_FALSE,
         vtxelement.stride_,
-        (void*)vtxelement.Offset));
+        (void*)vtxelement.Offset)); // TODO: Bug. It doesn't make sense to convert a 4-byte int into an 8-byte pointer.
 
       VertexDeclaration->_valid_vertex_input[shader_attribute_location] = 1;
       ++decl;

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2012-09-17 09:55:43 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2012-09-19 05:03:18 +0000
@@ -34,6 +34,7 @@
 #include "GraphicsDisplay.h"
 
 #include <X11/extensions/shape.h>
+#include <X11/XKBlib.h>
 
 namespace nux
 {
@@ -177,7 +178,7 @@
     return gfx_interface_created_;
   }
 
-  static Bool WaitForNotify( Display *dpy, XEvent *event, XPointer arg )
+  static Bool WaitForNotify( Display * /* dpy */, XEvent *event, XPointer arg )
   {
     return(event->type == MapNotify) && (event->xmap.window == (Window) arg);
   }
@@ -187,10 +188,10 @@
   bool GraphicsDisplay::CreateOpenGLWindow(const char* window_title,
                                          unsigned int WindowWidth,
                                          unsigned int WindowHeight,
-                                         WindowStyle Style,
-                                         const GraphicsDisplay *Parent,
+                                         WindowStyle /* Style */,
+                                         const GraphicsDisplay * /* Parent */,
                                          bool fullscreen_flag,
-                                         bool create_rendering_data)
+                                         bool /* create_rendering_data */)
   {
     int xinerama_event, xinerama_error;
     int xinerama_major, xinerama_minor;
@@ -1562,7 +1563,7 @@
         //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: KeyPress event.");
         KeyCode keycode = xevent.xkey.keycode;
         KeySym keysym = NoSymbol;
-        keysym = XKeycodeToKeysym(xevent.xany.display, keycode, 0);
+        keysym = XkbKeycodeToKeysym(xevent.xany.display, keycode, 0, 0);
 
         m_pEvent->key_modifiers = GetModifierKeyState(xevent.xkey.state);
         m_pEvent->key_repeat_count = 0;
@@ -1598,7 +1599,7 @@
         //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: KeyRelease event.");
         KeyCode keycode = xevent.xkey.keycode;
         KeySym keysym = NoSymbol;
-        keysym = XKeycodeToKeysym(xevent.xany.display, keycode, 0);
+        keysym = XkbKeycodeToKeysym(xevent.xany.display, keycode, 0, 0);
 
         m_pEvent->key_modifiers = GetModifierKeyState(xevent.xkey.state);
         m_pEvent->key_repeat_count = 0;
@@ -2382,7 +2383,7 @@
       _dnd_source_target_accepts_drop = false;
   }
 
-  void GraphicsDisplay::HandleXDndLeave(XEvent event)
+  void GraphicsDisplay::HandleXDndLeave(XEvent /* event */)
   {
     // reset the key things
     _xdnd_types[0] = 0;
@@ -2596,7 +2597,7 @@
     if (_global_pointer_grab_callback)
       (*_global_pointer_grab_callback) (false, data);
 
-    _global_pointer_grab_data = false;
+    _global_pointer_grab_data = 0;
     _global_pointer_grab_callback = 0;
 
     return true;

=== modified file 'NuxGraphics/GraphicsEngine.h'
--- NuxGraphics/GraphicsEngine.h	2012-09-17 09:55:43 +0000
+++ NuxGraphics/GraphicsEngine.h	2012-09-19 05:03:18 +0000
@@ -1016,8 +1016,8 @@
     ObjectPtr<IOpenGLShaderProgram> blend_color_tex_prog_[LAYER_BLEND_MODE_LAST];
     ObjectPtr<IOpenGLShaderProgram> blend_tex_tex_prog_[LAYER_BLEND_MODE_LAST];
     
-    const char* const GetBlendModeBlendFunc(LayerBlendMode layer_blend_mode);
-    const char* const GetBlendModeString(LayerBlendMode layer_blend_mode);
+    const char* GetBlendModeBlendFunc(LayerBlendMode layer_blend_mode);
+    const char* GetBlendModeString(LayerBlendMode layer_blend_mode);
     
     ObjectPtr <IOpenGLShaderProgram> GetColorBlendOverTexProgram(LayerBlendMode layer_blend_mode);
     ObjectPtr <IOpenGLShaderProgram> GetTexBlendOverColorProgram(LayerBlendMode layer_blend_mode);

=== modified file 'NuxGraphics/MeshData.cpp'
--- NuxGraphics/MeshData.cpp	2011-09-20 06:03:43 +0000
+++ NuxGraphics/MeshData.cpp	2012-09-19 05:03:18 +0000
@@ -62,6 +62,9 @@
     case NUX_MESH_POINT:
       _num_index = num_mesh_primitive;
       break;
+    case NUX_MESH_PRIMITIVE_UNKNOWN:
+      return false;
+      break;
     }
     _index_size = 4;
 

=== modified file 'NuxGraphics/RenderingPipeTextureBlend.cpp'
--- NuxGraphics/RenderingPipeTextureBlend.cpp	2012-05-25 20:36:09 +0000
+++ NuxGraphics/RenderingPipeTextureBlend.cpp	2012-09-19 05:03:18 +0000
@@ -33,7 +33,7 @@
 
 namespace nux
 {
-  const char* const
+  const char*
   GraphicsEngine::GetBlendModeBlendFunc(LayerBlendMode layer_blend_mode)
   {
     switch (layer_blend_mode)
@@ -50,7 +50,7 @@
       }
   }
 
-const char* const
+const char*
 GraphicsEngine::GetBlendModeString(LayerBlendMode layer_blend_mode)
 {
   switch (layer_blend_mode)

=== modified file 'NuxGraphics/XInputWindow.cpp'
--- NuxGraphics/XInputWindow.cpp	2012-01-18 21:08:29 +0000
+++ NuxGraphics/XInputWindow.cpp	2012-09-19 05:03:18 +0000
@@ -125,6 +125,8 @@
 
     XUnionRectWithRegion(&tmp_rect, input_window_region, input_window_region);
 
+    monitor = tmp_rect;
+
     /* If there is no Xinerama data available just use the geometry we have */
     if (!info)
     {