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

fixed compile errors for wxTreeListCtrl on OSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-05-16 17:49:56 +00:00
parent 7160e19699
commit 11f9207e9e
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wxPython/contrib/gizmos/treelistctrl.cpp
View File

@@ -18,7 +18,7 @@
// headers // headers
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#ifdef __GNUG__ #if defined(__GNUG__) && !defined(__APPLE__)
#pragma implementation "treelistctrl.h" #pragma implementation "treelistctrl.h"
#endif #endif
@@ -30,9 +30,6 @@
#endif #endif
//#include "wx/gizmos/treelistctrl.h"
#include "treelistctrl.h"
#include <wx/treebase.h> #include <wx/treebase.h>
#include <wx/timer.h> #include <wx/timer.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
@@ -42,6 +39,10 @@
#include <wx/dcscreen.h> #include <wx/dcscreen.h>
#include <wx/scrolwin.h> #include <wx/scrolwin.h>
//#include "wx/gizmos/treelistctrl.h"
#include "treelistctrl.h"
#ifdef __WXGTK__ #ifdef __WXGTK__
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <wx/gtk/win_gtk.h> #include <wx/gtk/win_gtk.h>
@@ -537,7 +538,7 @@ protected:
size_t m_main_column; // ALB size_t m_main_column; // ALB
friend class wxTreeListItem; friend class wxTreeListItem;
friend class wxTreeRenameTimer; friend class wxTreeListRenameTimer;
friend class wxTreeListTextCtrl; friend class wxTreeListTextCtrl;
wxFont m_normalFont; wxFont m_normalFont;
@@ -628,10 +629,10 @@ private:
// timer used for enabling in-place edit // timer used for enabling in-place edit
class wxTreeRenameTimer: public wxTimer class wxTreeListRenameTimer: public wxTimer
{ {
public: public:
wxTreeRenameTimer( wxTreeListMainWindow *owner ); wxTreeListRenameTimer( wxTreeListMainWindow *owner );
void Notify(); void Notify();
@@ -881,15 +882,15 @@ static void EventFlagsToSelType(long style,
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxTreeRenameTimer (internal) // wxTreeListRenameTimer (internal)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
wxTreeRenameTimer::wxTreeRenameTimer( wxTreeListMainWindow *owner ) wxTreeListRenameTimer::wxTreeListRenameTimer( wxTreeListMainWindow *owner )
{ {
m_owner = owner; m_owner = owner;
} }
void wxTreeRenameTimer::Notify() void wxTreeListRenameTimer::Notify()
{ {
m_owner->OnRenameTimer(); m_owner->OnRenameTimer();
} }
@@ -1764,7 +1765,7 @@ void wxTreeListMainWindow::Init()
m_isDragging = FALSE; m_isDragging = FALSE;
m_dropTarget = m_oldSelection = (wxTreeListItem *)NULL; m_dropTarget = m_oldSelection = (wxTreeListItem *)NULL;
m_renameTimer = new wxTreeRenameTimer( this ); m_renameTimer = new wxTreeListRenameTimer( this );
m_lastOnSame = FALSE; m_lastOnSame = FALSE;
m_normalFont = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ); m_normalFont = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT );

6
wxPython/contrib/gizmos/treelistctrl.h
View File

@@ -10,10 +10,10 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef TREELISRCTRL_H #ifndef TREELISTCTRL_H
#define TREELISTCTRL_H #define TREELISTCTRL_H
#ifdef __GNUG__ #if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "treelistctrl.h" #pragma interface "treelistctrl.h"
#endif #endif
@@ -60,6 +60,8 @@ public:
m_alignment = alignment; m_alignment = alignment;
} }
~wxTreeListColumnInfo() {}
// getters // getters
wxTreeListColumnAlign GetAlignment() const { return m_alignment; } wxTreeListColumnAlign GetAlignment() const { return m_alignment; }
wxString GetText() const { return m_text; } wxString GetText() const { return m_text; }