disallow creation of wxDC objects and made wxDC an ABC; use wxDCTemp instead of wxDC...

[wxWidgets.git] / src / generic / listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 69e9c26f885165622a1e1801c400b74ee233fbe9..4b725aaad44544e02e7275c31257db6065a83d6d 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -23,11 +23,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "listctrl.h"
-    #pragma implementation "listctrlbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -142,9 +137,8 @@ static const int MARGIN_BETWEEN_ROWS = 6;
 // when autosizing the columns, add some slack
 static const int AUTOSIZE_COL_MARGIN = 10;
 
 // when autosizing the columns, add some slack
 static const int AUTOSIZE_COL_MARGIN = 10;
 

-// default and minimal widths for the header columns
+// default width for the header columns

 static const int WIDTH_COL_DEFAULT = 80;
 static const int WIDTH_COL_DEFAULT = 80;

-static const int WIDTH_COL_MIN = 10;

 
 // the space between the image and the text in the report mode
 static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
 
 // the space between the image and the text in the report mode
 static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;


@@ -290,7 +284,7 @@ private:
 
 WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
 #include "wx/listimpl.cpp"
 
 WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxListItemDataList);
+WX_DEFINE_LIST(wxListItemDataList)

 
 class wxListLineData
 {
 
 class wxListLineData
 {


@@ -367,7 +361,7 @@ public:
     void GetItem( int index, wxListItem &info );
 
     wxString GetText(int index) const;
     void GetItem( int index, wxListItem &info );
 
     wxString GetText(int index) const;

-    void SetText( int index, const wxString s );
+    void SetText( int index, const wxString& s );

 
     wxListItemAttr *GetAttr() const;
     void SetAttr(wxListItemAttr *attr);
 
     wxListItemAttr *GetAttr() const;
     void SetAttr(wxListItemAttr *attr);


@@ -418,7 +412,7 @@ private:
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
 #include "wx/arrimpl.cpp"
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxListLineDataArray);
+WX_DEFINE_OBJARRAY(wxListLineDataArray)

 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)


@@ -471,7 +465,7 @@ private:
 
     // generate and process the list event of the given type, return true if
     // it wasn't vetoed, i.e. if we should proceed
 
     // generate and process the list event of the given type, return true if
     // it wasn't vetoed, i.e. if we should proceed

-    bool SendListEvent(wxEventType type, wxPoint pos);
+    bool SendListEvent(wxEventType type, const wxPoint& pos);

 
     DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
     DECLARE_EVENT_TABLE()


@@ -524,7 +518,7 @@ private:
 
 WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
 #include "wx/listimpl.cpp"
 
 WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxListHeaderDataList);
+WX_DEFINE_LIST(wxListHeaderDataList)

 
 class wxListMainWindow : public wxScrolledWindow
 {
 
 class wxListMainWindow : public wxScrolledWindow
 {


@@ -722,7 +716,7 @@ public:
     // send out a wxListEvent
     void SendNotify( size_t line,
                      wxEventType command,
     // send out a wxListEvent
     void SendNotify( size_t line,
                      wxEventType command,

-                     wxPoint point = wxDefaultPosition );
+                     const wxPoint& point = wxDefaultPosition );

 
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
 
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)


@@ -1080,11 +1074,7 @@ void wxListHeaderData::SetHeight( int h )
 
 void wxListHeaderData::SetWidth( int w )
 {
 
 void wxListHeaderData::SetWidth( int w )
 {

-    m_width = w;
-    if (m_width < 0)
-        m_width = WIDTH_COL_DEFAULT;
-    else if (m_width < WIDTH_COL_MIN)
-        m_width = WIDTH_COL_MIN;
+    m_width = w < 0 ? WIDTH_COL_DEFAULT : w;

 }
 
 void wxListHeaderData::SetFormat( int format )
 }
 
 void wxListHeaderData::SetFormat( int format )


@@ -1370,7 +1360,7 @@ wxString wxListLineData::GetText(int index) const
     return s;
 }
 
     return s;
 }
 

-void wxListLineData::SetText( int index, const wxString s )
+void wxListLineData::SetText( int index, const wxString& s )

 {
     wxListItemDataList::compatibility_iterator node = m_items.Item( index );
     if (node)
 {
     wxListItemDataList::compatibility_iterator node = m_items.Item( index );
     if (node)


@@ -2014,7 +2004,7 @@ void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
     m_owner->Update();
 }
 
     m_owner->Update();
 }
 

-bool wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos)
+bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos)

 {
     wxWindow *parent = GetParent();
     wxListEvent le( type, parent->GetId() );
 {
     wxWindow *parent = GetParent();
     wxListEvent le( type, parent->GetId() );


@@ -2799,7 +2789,7 @@ void wxListMainWindow::HighlightAll( bool on )
 
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,
 
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,

-                                   wxPoint point )
+                                   const wxPoint& point )

 {
     wxListEvent le( command, GetParent()->GetId() );
     le.SetEventObject( GetParent() );
 {
     wxListEvent le( command, GetParent()->GetId() );
     le.SetEventObject( GetParent() );