From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 23 Feb 1999 22:57:19 +0000 (+0000)
Subject: some very minor fixes (I don't even remember what exactly)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c793fa87560be70db04634202453bbf3ba114535?ds=sidebyside

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
---

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 78fd6c42be..e331678228 100644
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -6,94 +6,105 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
 #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(void);
+    wxIconRefData();
+    ~wxIconRefData();
 
 public:
-  WXHICON m_hIcon;
+    WXHICON m_hIcon;
 };
 
 #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)
+    DECLARE_DYNAMIC_CLASS(wxIcon)
 
 public:
-  wxIcon(void);
+    wxIcon();
 
-  // Copy constructors
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
+    // Copy constructors
+    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(const char bits[], int width, int height);
+    wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+           int desiredWidth = -1, int desiredHeight = -1);
+    ~wxIcon();
 
-  bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-      int desiredWidth = -1, int desiredHeight = -1);
+    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; }
-  inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+    wxIcon& operator = (const wxIcon& icon)
+        { if (*this == icon) return (*this); Ref(icon); return *this; }
+    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); }
+    void SetHICON(WXHICON ico);
+    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);
+    bool FreeResource(bool force = FALSE);
 };
 
 // TODO: Put these in separate, private header
 
 class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+
 public:
-  inline wxICOFileHandler(void)
-  {
-	m_name = "ICO icon file";
-	m_extension = "ico";
-	m_type = wxBITMAP_TYPE_ICO;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
+    wxICOFileHandler()
+    {
+        m_name = "ICO icon file";
+        m_extension = "ico";
+        m_type = wxBITMAP_TYPE_ICO;
+    };
+
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+                          int desiredWidth = -1, int desiredHeight = -1);
 };
 
 class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+
 public:
-  inline wxICOResourceHandler(void)
-  {
-	m_name = "ICO resource";
-	m_extension = "ico";
-	m_type = wxBITMAP_TYPE_ICO_RESOURCE;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
+    wxICOResourceHandler()
+    {
+        m_name = "ICO resource";
+        m_extension = "ico";
+        m_type = wxBITMAP_TYPE_ICO_RESOURCE;
+    };
+
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+                          int desiredWidth = -1, int desiredHeight = -1);
 
 };
 
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 5a89abe6e5..1e9e94156f 100644
--- a/src/generic/prntdlgg.cpp
+++ b/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>
diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index ff62b50293..a7550da428 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -620,13 +620,18 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long
     M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ::LoadBitmap(wxGetInstance(), name);
     if (M_BITMAPHANDLERDATA->m_hBitmap)
     {
-      M_BITMAPHANDLERDATA->m_ok = TRUE;
-      BITMAP bm;
-      GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(BITMAP), (LPSTR) &bm);
-      M_BITMAPHANDLERDATA->m_width = bm.bmWidth;
-      M_BITMAPHANDLERDATA->m_height = bm.bmHeight;
-      M_BITMAPHANDLERDATA->m_depth = bm.bmBitsPixel;
-      return TRUE;
+        M_BITMAPHANDLERDATA->m_ok = TRUE;
+        BITMAP bm;
+        GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(BITMAP), (LPSTR) &bm);
+        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;
     }
 
   // it's probably not found