some very minor fixes (I don't even remember what exactly)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/icon.h

@@ -13,18 +13,22 @@
 #define _WX_ICON_H_
 
 #ifdef __GNUG__
-#pragma interface "icon.h"
+    #pragma interface "icon.h"
 #endif
 
 #include "wx/bitmap.h"
 
+// ---------------------------------------------------------------------------
+// icon data
+// ---------------------------------------------------------------------------
 class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
 {
     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxIcon;
+
 public:
-    wxIconRefData(void);
+    wxIconRefData();
-    ~wxIconRefData(void);
+    ~wxIconRefData();
 
 public:
     WXHICON m_hIcon;
@@ -33,33 +37,38 @@ public:
 #define M_ICONDATA ((wxIconRefData *)m_refData)
 #define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
 
+// ---------------------------------------------------------------------------
 // Icon
-class WXDLLEXPORT wxIcon: public wxBitmap
+// ---------------------------------------------------------------------------
+class WXDLLEXPORT wxIcon : public wxBitmap
 {
     DECLARE_DYNAMIC_CLASS(wxIcon)
 
 public:
-  wxIcon(void);
+    wxIcon();
 
     // Copy constructors
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
+    wxIcon(const wxIcon& icon) { Ref(icon); }
 
     wxIcon(const char bits[], int width, int height);
     wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);
-  ~wxIcon(void);
+    ~wxIcon();
 
     bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
                   int desiredWidth = -1, int desiredHeight = -1);
 
-  inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
+    wxIcon& operator = (const wxIcon& icon)
-  inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
+        { if (*this == icon) return (*this); Ref(icon); return *this; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+    bool operator == (const wxIcon& icon) const
+        { return m_refData == icon.m_refData; }
+    bool operator != (const wxIcon& icon) const
+        { return m_refData != icon.m_refData; }
 
     void SetHICON(WXHICON ico);
-  inline WXHICON GetHICON(void) const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
+    WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
 
-  virtual bool Ok(void) const { return (m_refData != NULL && M_ICONDATA->m_hIcon) ; }
+    bool Ok() const { return (m_refData != NULL && M_ICONDATA->m_hIcon != 0) ; }
 
     bool FreeResource(bool force = FALSE);
 };
@@ -68,9 +77,10 @@ public:
 
 class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+
 public:
-  inline wxICOFileHandler(void)
+    wxICOFileHandler()
     {
         m_name = "ICO icon file";
         m_extension = "ico";
@@ -83,9 +93,10 @@ public:
 
 class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+
 public:
-  inline wxICOResourceHandler(void)
+    wxICOResourceHandler()
     {
         m_name = "ICO resource";
         m_extension = "ico";

src/generic/prntdlgg.cpp

@@ -39,6 +39,7 @@
 #endif
 
 #include "wx/generic/prntdlgg.h"
+#include "wx/generic/dcpsg.h"
 #include "wx/printdlg.h"
 
 #include <stdlib.h>

src/msw/bitmap.cpp

@@ -626,6 +626,11 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long
         M_BITMAPHANDLERDATA->m_width = bm.bmWidth;
         M_BITMAPHANDLERDATA->m_height = bm.bmHeight;
         M_BITMAPHANDLERDATA->m_depth = bm.bmBitsPixel;
+
+        if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
+        {
+        }
+
         return TRUE;
     }