check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

[wxWidgets.git] / src / motif / icon.cpp

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 54edd5f3cb0ed3a6a540762625cbf72f38d5e25d..b1a4a57d6b3ce5ab87c20afbf75bde3e1e7455a1 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -9,10 +9,13 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "icon.h"
 #endif
 
 #pragma implementation "icon.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/icon.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
 #include "wx/icon.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);


@@ -42,13 +45,6 @@ wxIcon::wxIcon(const char **data)
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 

-wxIcon::wxIcon(const wxString& icon_file, wxBitmapType type,
-               int desiredWidth, int desiredHeight)
-               
-{
-    LoadFile(icon_file, type, desiredWidth, desiredHeight);
-}
-

 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
     wxIcon *icon = (wxIcon*)(&bmp);
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
     wxIcon *icon = (wxIcon*)(&bmp);


@@ -70,5 +66,5 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
         return handler->LoadFile(this, filename, type,
                                  desiredWidth, desiredHeight);
     else
         return handler->LoadFile(this, filename, type,
                                  desiredWidth, desiredHeight);
     else

-        return FALSE;
+        return false;

 }
 }