RegisterAdditionalEditors() to work even if no wxPropertyGrids created, in sample...

[wxWidgets.git] / src / common / imagall.cpp

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index bb4d3dc7ddbc5f5a8687533f6338c2e818f6a16e..87bac918c2a26f4d823ead73ca19cb8e1c70c0fb 100644 (file)
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagall.cpp
+// Name:        src/common/imagall.cpp

 // Purpose:     wxImage access all handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Purpose:     wxImage access all handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$


@@ -11,17 +11,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/setup.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/image.h"
-
-#if wxUSE_IMAGE
-

 //-----------------------------------------------------------------------------
 // This function allows dynamic access to all image handlers compile within
 // the library. This function should be in a separate file as some compilers
 //-----------------------------------------------------------------------------
 // This function allows dynamic access to all image handlers compile within
 // the library. This function should be in a separate file as some compilers


@@ -55,6 +53,9 @@ void wxInitAllImageHandlers()
   wxImage::AddHandler( new wxCURHandler );
   wxImage::AddHandler( new wxANIHandler );
 #endif
   wxImage::AddHandler( new wxCURHandler );
   wxImage::AddHandler( new wxANIHandler );
 #endif

+#if wxUSE_TGA
+  wxImage::AddHandler( new wxTGAHandler );
+#endif

 #if wxUSE_XPM
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 #if wxUSE_XPM
   wxImage::AddHandler( new wxXPMHandler );
 #endif