Force wide char environment version initialization in wxGetEnvMap().

[wxWidgets.git] / include / wx / headerctrl.h

diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index 3118ee99cb0dc5459aee136b29e6d502b0107d2e..08940d5b21170af70ccf791fcbdb70101962e727 100644 (file)
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -154,6 +154,8 @@ public:
     // specified) and if the control has wxHD_ALLOW_REORDER style as well
     bool ShowCustomizeDialog();
 
     // specified) and if the control has wxHD_ALLOW_REORDER style as well
     bool ShowCustomizeDialog();
 

+    // compute column title width
+    int GetColumnTitleWidth(const wxHeaderColumn& col);

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -350,7 +352,10 @@ private:
     void Init();
 
     // bring the column count in sync with the number of columns we store
     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
 
 
     // all our current columns


@@ -361,7 +366,7 @@ private:
     unsigned int m_sortKey;
 
 
     unsigned int m_sortKey;
 
 

-    DECLARE_NO_COPY_CLASS(wxHeaderCtrlSimple)
+    wxDECLARE_NO_COPY_CLASS(wxHeaderCtrlSimple);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------