avoid warnings C4311/4312 when building with MSVC >= 7 (patch 1414052)

[wxWidgets.git] / include / wx / msw / checklst.h

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 4840d09253310d21d5c5b4b4a85ba30ebfd5bc7a..23665f2793eeff216171c041e82407ac1b79fd76 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -12,10 +12,6 @@
 #ifndef   __CHECKLST__H_
 #define   __CHECKLST__H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "checklst.h"
-#endif
-
 #if !wxUSE_OWNER_DRAWN
   #error  "wxCheckListBox class requires owner-drawn functionality."
 #endif
@@ -66,7 +62,7 @@ public:
 
   // items may be checked
   virtual bool IsChecked(size_t uiIndex) const;
-  virtual void Check(size_t uiIndex, bool bCheck = TRUE);
+  virtual void Check(size_t uiIndex, bool bCheck = true);
 
   // return the index of the item at this position or wxNOT_FOUND
   int HitTest(const wxPoint& pt) const { return DoHitTestItem(pt.x, pt.y); }
@@ -75,12 +71,12 @@ public:
   // accessors
   size_t GetItemHeight() const { return m_nItemHeight; }
 
-protected:
   // we create our items ourselves and they have non-standard size,
   // so we need to override these functions
   virtual wxOwnerDrawn *CreateLboxItem(size_t n);
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
+protected:
   // this can't be called DoHitTest() because wxWindow already has this method
   int DoHitTestItem(wxCoord x, wxCoord y) const;