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

Fixed various wxMSW compile problems that came down the telephone line...

Browse Source 
plus wxTreeCtrl::EditLabel/EndEditLabel, dialog editor stuff, wxMSW header changes,
doc changes. Sorry about the quantity :-(


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-07 23:52:45 +00:00
parent c2d8daeb4a
commit bbcdf8bc7c
110 changed files with 1009 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/msw/listctrl.cpp
View File

@@ -54,6 +54,7 @@ wxListCtrl::wxListCtrl(void)
m_imageListState = NULL;
m_baseStyle = 0;
m_colCount = 0;
m_textCtrl = NULL;
}
bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
@@ -62,6 +63,7 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
m_imageListNormal = NULL;
m_imageListSmall = NULL;
m_imageListState = NULL;
m_textCtrl = NULL;
m_colCount = 0;
wxSystemSettings settings;
@@ -129,7 +131,13 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
wxListCtrl::~wxListCtrl(void)
{
m_textCtrl.SetHWND((WXHWND) NULL);
if (m_textCtrl)
{
m_textCtrl->UnsubclassWin();
m_textCtrl->SetHWND(0);
delete m_textCtrl;
m_textCtrl = NULL;
}
}
// Add or remove a single window style
@@ -441,11 +449,9 @@ int wxListCtrl::GetCountPerPage(void) const
}
// Gets the edit control for editing labels.
wxTextCtrl& wxListCtrl::GetEditControl(void) const
wxTextCtrl* wxListCtrl::GetEditControl(void) const
{
HWND hWnd = (HWND) ListView_GetEditControl((HWND) GetHWND());
((wxListCtrl *)this)->m_textCtrl.SetHWND((WXHWND) hWnd);
return (wxTextCtrl&)m_textCtrl;
return m_textCtrl;
}
// Gets information about the item
@@ -806,14 +812,49 @@ void wxListCtrl::ClearAll(void)
DeleteAllColumns();
}
// Edits a label
wxTextCtrl& wxListCtrl::Edit(long item)
wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
{
HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), (int) item);
m_textCtrl.SetHWND((WXHWND) hWnd);
return m_textCtrl;
wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), item);
if (m_textCtrl)
{
m_textCtrl->UnsubclassWin();
m_textCtrl->SetHWND(0);
delete m_textCtrl;
m_textCtrl = NULL;
}
m_textCtrl = (wxTextCtrl*) textControlClass->CreateObject();
m_textCtrl->SetHWND((WXHWND) hWnd);
m_textCtrl->SubclassWin((WXHWND) hWnd);
return m_textCtrl;
}
// End label editing, optionally cancelling the edit
bool wxListCtrl::EndEditLabel(bool cancel)
{
wxASSERT( FALSE);
/* I don't know how to implement this: there's no such macro as ListView_EndEditLabelNow.
* ???
bool success = (ListView_EndEditLabelNow((HWND) GetHWND(), cancel) != 0);
if (m_textCtrl)
{
m_textCtrl->UnsubclassWin();
m_textCtrl->SetHWND(0);
delete m_textCtrl;
m_textCtrl = NULL;
}
return success;
*/
return FALSE;
}
// Ensures this item is visible
bool wxListCtrl::EnsureVisible(long item)
{