Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no changes, just removed whitespace and perfectly useless "/* if */" and the incredible "// variable definition and initialization" and wx version checks unnecessary inside wx itself

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-07 21:05:30 +00:00
parent b63dc1c140
commit 5829b3034b
2 changed files with 413 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
include/wx/osx/carbon/dataview.h
View File

@@ -347,103 +347,94 @@ private:
class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
{ {
public: public:
// // constructors / destructor
// constructors / destructor wxDataViewColumn(const wxString& title,
// wxDataViewRenderer* renderer,
wxDataViewColumn(wxString const& title, wxDataViewRenderer* renderer, unsigned int model_column, int width=80, wxAlignment align=wxALIGN_CENTER, unsigned int model_column,
int flags=wxDATAVIEW_COL_RESIZABLE); int width = wxDVC_DEFAULT_WIDTH,
wxDataViewColumn(wxBitmap const& bitmap, wxDataViewRenderer* renderer, unsigned int model_column, int width=80, wxAlignment align=wxALIGN_CENTER, wxAlignment align = wxALIGN_CENTER,
int flags=wxDATAVIEW_COL_RESIZABLE); int flags = wxDATAVIEW_COL_RESIZABLE)
: wxDataViewColumnBase(renderer, model_column),
m_title(title)
{
Init(width, align, flags);
}
// wxDataViewColumn(const wxBitmap& bitmap,
// inherited methods from wxDataViewColumnBase wxDataViewRenderer* renderer,
// unsigned int model_column,
virtual wxAlignment GetAlignment() const int width = wxDVC_DEFAULT_WIDTH,
{ wxAlignment align = wxALIGN_CENTER,
return this->m_alignment; int flags = wxDATAVIEW_COL_RESIZABLE)
} : wxDataViewColumnBase(bitmap, renderer, model_column)
virtual int GetFlags() const {
{ Init(width, align, flags);
return this->m_flags; }
}
virtual int GetMaxWidth() const
{
return this->m_maxWidth;
}
virtual int GetMinWidth() const
{
return this->m_minWidth;
}
virtual wxString GetTitle() const
{
return this->m_title;
}
virtual int GetWidth() const
{
return this->m_width;
}
virtual bool IsHidden() const // implement wxHeaderColumnBase pure virtual methods
{ virtual wxAlignment GetAlignment() const { return m_alignment; }
return false; // not implemented virtual int GetFlags() const { return m_flags; }
} virtual int GetMaxWidth() const { return m_maxWidth; }
virtual bool IsSortOrderAscending() const virtual int GetMinWidth() const { return m_minWidth; }
{ virtual wxString GetTitle() const { return m_title; }
return this->m_ascending; virtual int GetWidth() const { return m_width; }
} virtual bool IsHidden() const { return false; } // TODO
virtual bool IsSortOrderAscending() const { return m_ascending; }
virtual void SetAlignment(wxAlignment align); virtual void SetAlignment(wxAlignment align);
virtual void SetBitmap (wxBitmap const& bitmap); virtual void SetBitmap (wxBitmap const& bitmap);
virtual void SetFlags (int flags); virtual void SetFlags (int flags) { SetIndividualFlags(flags); }
virtual void SetHidden(bool WXUNUSED(hidden)) virtual void SetHidden(bool WXUNUSED(hidden)) { } // TODO
{ virtual void SetMaxWidth (int maxWidth);
} virtual void SetMinWidth (int minWidth);
virtual void SetMaxWidth (int maxWidth); virtual void SetReorderable(bool reorderable);
virtual void SetMinWidth (int minWidth); virtual void SetResizeable (bool resizeable);
virtual void SetReorderable(bool reorderable); virtual void SetSortable (bool sortable);
virtual void SetResizeable (bool resizeable); virtual void SetSortOrder (bool ascending);
virtual void SetSortable (bool sortable); virtual void SetTitle (wxString const& title);
virtual void SetSortOrder (bool ascending); virtual void SetWidth (int width);
virtual void SetTitle (wxString const& title);
virtual void SetWidth (int width);
// // implementation only
// implementation WXDataBrowserPropertyID GetPropertyID() const
// {
WXDataBrowserPropertyID GetPropertyID() const return m_propertyID;
{ }
return this->m_propertyID;
}
void SetPropertyID(WXDataBrowserPropertyID newID) void SetPropertyID(WXDataBrowserPropertyID newID)
{ {
this->m_propertyID = newID; m_propertyID = newID;
} }
void SetWidthVariable(int NewWidth) void SetWidthVariable(int NewWidth)
{ {
this->m_width = NewWidth; m_width = NewWidth;
} }
protected:
private: private:
// // common part of all ctors
// variables void Init(int width, wxAlignment align, int flags)
// {
bool m_ascending; // sorting order m_ascending = true;
m_flags = flags & ~wxDATAVIEW_COL_HIDDEN; // TODO
m_maxWidth = 30000;
m_minWidth = 0;
m_width = width >= 0 ? width : wxDVC_DEFAULT_WIDTH;
m_alignment = align;
}
WXDataBrowserPropertyID m_propertyID; // each column is identified by its unique property ID (NOT by the column index) bool m_ascending; // sorting order
int m_flags; // flags for the column // each column is identified by its unique property ID (NOT by the column
int m_maxWidth; // maximum width for the column // index)
int m_minWidth; // minimum width for the column WXDataBrowserPropertyID m_propertyID;
int m_width; // column width
wxAlignment m_alignment; // column header alignment int m_flags; // flags for the column
int m_maxWidth; // maximum width for the column
int m_minWidth; // minimum width for the column
int m_width; // column width
wxString m_title; // column title wxAlignment m_alignment; // column header alignment
// wxWidget internal stuff: wxString m_title; // column title
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------

542
src/osx/carbon/dataview.cpp
View File

File diff suppressed because it is too large Load Diff