change superflous elif to else

[wxWidgets.git] / include / wx / generic / imaglist.h

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index be21d3dcfa6a0188573f357ae5645471d793ccba..692302e433a1b66940e81f63afceb34ae3ac54fb 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -4,21 +4,23 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__
 #define __IMAGELISTH_G__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__
 #define __IMAGELISTH_G__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "imaglist.h"
 #endif
 
 #include "wx/defs.h"
 #pragma interface "imaglist.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/gdicmn.h"
-#include "wx/bitmap.h"
-#include "wx/dc.h"
+#include "wx/list.h"
+
+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxColour;

 
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
 
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to


@@ -54,10 +56,10 @@ enum {
 class WXDLLEXPORT wxGenericImageList: public wxObject
 {
 public:
 class WXDLLEXPORT wxGenericImageList: public wxObject
 {
 public:

-    wxGenericImageList() { }
-    wxGenericImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
+    wxGenericImageList() { m_width = m_height = 0; }
+    wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );

     ~wxGenericImageList();
     ~wxGenericImageList();

-    bool Create( int width, int height, bool mask = TRUE, int initialCount = 1 );
+    bool Create( int width, int height, bool mask = true, int initialCount = 1 );

     bool Create();
 
     virtual int GetImageCount() const;
     bool Create();
 
     virtual int GetImageCount() const;


@@ -73,7 +75,7 @@ public:
 
     virtual bool Draw(int index, wxDC& dc, int x, int y,
               int flags = wxIMAGELIST_DRAW_NORMAL,
 
     virtual bool Draw(int index, wxDC& dc, int x, int y,
               int flags = wxIMAGELIST_DRAW_NORMAL,

-              bool solidBackground = FALSE);
+              bool solidBackground = false);

 
 private:
     wxList  m_images;
 
 private:
     wxList  m_images;


@@ -84,7 +86,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericImageList)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericImageList)
 };
 

-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)

 /*
  * wxImageList has to be a real class or we have problems with
  * the run-time information.
 /*
  * wxImageList has to be a real class or we have problems with
  * the run-time information.


@@ -97,12 +99,12 @@ class WXDLLEXPORT wxImageList: public wxGenericImageList
 public:
     wxImageList() {}
 
 public:
     wxImageList() {}
 

-    wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 )
+    wxImageList( int width, int height, bool mask = true, int initialCount = 1 )

         : wxGenericImageList(width, height, mask, initialCount)
     {
     }
 };
         : wxGenericImageList(width, height, mask, initialCount)
     {
     }
 };

-#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__
+#endif // !__WXMSW__ || __WXUNIVERSAL__

 
 #endif  // __IMAGELISTH_G__
 
 
 #endif  // __IMAGELISTH_G__