X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5313727812e1636f4c4aeceea3f9e93d01cfce43..5c14ec264057d86fe60b2bacc09965492652cc0f:/include/wx/headerctrl.h

diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index 9555e26155..31373bb1c3 100644
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -210,6 +210,10 @@ protected:
     // indices after the number of columns changed
     void DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int count);
 
+protected:
+    // this window doesn't look nice with the border so don't use it by default
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
 private:
     // methods implementing our public API and defined in platform-specific
     // implementations
@@ -222,8 +226,6 @@ private:
     virtual void DoSetColumnsOrder(const wxArrayInt& order) = 0;
     virtual wxArrayInt DoGetColumnsOrder() const = 0;
 
-    // this window doesn't look nice with the border so don't use it by default
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // event handlers
     void OnSeparatorDClick(wxHeaderCtrlEvent& event);
@@ -352,7 +354,10 @@ private:
     void Init();
 
     // bring the column count in sync with the number of columns we store
-    void UpdateColumnCount() { SetColumnCount(m_cols.size()); }
+    void UpdateColumnCount()
+    {
+        SetColumnCount(static_cast<int>(m_cols.size()));
+    }
 
 
     // all our current columns