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

Include wx/textctrl.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-06 07:23:19 +00:00
parent 88f5a9ba6e
commit fec9cc08e7
32 changed files with 353 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cocoa/textctrl.mm
View File

@@ -1,18 +1,20 @@
/////////////////////////////////////////////////////////////////////////////
// Name: cocoa/textctrl.mm
// Name: src/cocoa/textctrl.mm
// Purpose: wxTextCtrl
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// RCS-ID: $Id:
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/textctrl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
@@ -220,4 +222,3 @@ wxSize wxTextCtrl::DoGetBestSize() const
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxTextCtrl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
return size;
}

4
src/common/clrpickercmn.cpp
View File

@@ -28,7 +28,9 @@
#include "wx/clrpicker.h"
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif
// ============================================================================

5
src/common/fontpickercmn.cpp
View File

@@ -28,7 +28,10 @@
#include "wx/fontpicker.h"
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif
#include "wx/fontenum.h"
#include "wx/tokenzr.h"

10
src/common/pickerbase.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: common/pickerbase.cpp
// Name: src/common/pickerbase.cpp
// Purpose: wxPickerBase class implementation
// Author: Francesco Montorsi
// Modified by:
@@ -26,7 +26,9 @@
#include "wx/pickerbase.h"
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif
// ============================================================================
// implementation
@@ -60,7 +62,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
// remove any border style from our style as wxPickerBase's window must be
// invisible (user styles must be set on the textctrl or the platform-dependent picker)
style &= ~wxBORDER_MASK;
if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
validator, name))
return false;
@@ -107,7 +109,7 @@ void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent &)
wxASSERT(m_text);
// don't leave the textctrl empty
if (m_text->GetValue().IsEmpty())
if (m_text->GetValue().empty())
UpdateTextCtrlFromPicker();
}

2
src/generic/dirctrlg.cpp
View File

@@ -31,11 +31,11 @@
#include "wx/msgdlg.h"
#include "wx/cmndata.h"
#include "wx/choice.h"
#include "wx/textctrl.h"
#endif
#include "wx/module.h"
#include "wx/layout.h"
#include "wx/textctrl.h"
#include "wx/textdlg.h"
#include "wx/filefn.h"
#include "wx/gdicmn.h"

2
src/generic/filedlgg.cpp
View File

@@ -33,9 +33,9 @@
#include "wx/checkbox.h"
#include "wx/choice.h"
#include "wx/stattext.h"
#include "wx/textctrl.h"
#endif
#include "wx/textctrl.h"
#include "wx/longlong.h"
#include "wx/sizer.h"
#include "wx/tokenzr.h"

2
src/generic/treectlg.cpp
View File

@@ -33,10 +33,10 @@
#include "wx/timer.h"
#include "wx/settings.h"
#include "wx/listbox.h"
#include "wx/textctrl.h"
#endif
#include "wx/generic/treectlg.h"
#include "wx/textctrl.h"
#include "wx/imaglist.h"
#include "wx/renderer.h"

3
src/gtk/combobox.cpp
View File

@@ -17,12 +17,11 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/settings.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#endif
#include "wx/arrstr.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
// We use GtkCombo which has been deprecated since GTK+ 2.3.0
// in favour of GtkComboBox for <GTK2.4 runtime
// We also use GtkList

97
src/gtk/treegtk.cpp
View File

@@ -19,10 +19,10 @@
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/log.h"
#include "wx/textctrl.h"
#endif
#include "wx/gtk/treectrl.h"
#include "wx/textctrl.h"
#include <gtk/gtk.h>
@@ -103,7 +103,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
if (y < 0)
y = 0;
m_needParent = TRUE;
m_needParent = true;
printf("precreate\n");
PreCreation( parent, id, pos, size, style, name );
@@ -133,9 +133,9 @@ printf("postcreate\n");
gtk_widget_realize(GTK_WIDGET(m_tree));
Show(TRUE);
Show(true);
return TRUE;
return true;
}
wxTreeCtrl::~wxTreeCtrl(void) {
@@ -739,49 +739,54 @@ long wxTreeCtrl::GetFirstVisibleItem(void) const {
return (-1);
}
long wxTreeCtrl::GetNextVisibleItem(long item) const {
GtkTreeItem *p;
GtkTreeItem *next = NULL;
long wxTreeCtrl::GetNextVisibleItem(long item) const
{
GtkTreeItem *p;
GtkTreeItem *next = NULL;
p = findGtkTreeItem(item);
GList *list = gtk_container_get_children(GTK_CONTAINER(p));
next = GTK_TREE_ITEM(list->data);
p = findGtkTreeItem(item);
GList *list = gtk_container_get_children(GTK_CONTAINER(p));
next = GTK_TREE_ITEM(list->data);
// gtk_container_foreach(GTK_CONTAINER(p), gtk_treectrl_next_visible_callback, &next);
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
return (-1);
return wxNOT_FOUND;
}
bool wxTreeCtrl::GetItem(wxTreeItem& info) const {
GtkTreeItem *p;
bool wxTreeCtrl::GetItem(wxTreeItem& info) const
{
GtkTreeItem *p;
p = findGtkTreeItem(info.m_itemId);
p = findGtkTreeItem(info.m_itemId);
if (p == NULL) {
wxLogSysError("TreeCtrl::GetItem failed");
return FALSE;
}
if (p == NULL)
{
wxLogSysError("TreeCtrl::GetItem failed");
return false;
}
wxConvertFromGtkTreeItem(info, p);
wxConvertFromGtkTreeItem(info, p);
return TRUE;
return true;
}
bool wxTreeCtrl::SetItem(wxTreeItem& info) {
GtkTreeItem *p;
bool wxTreeCtrl::SetItem(wxTreeItem& info)
{
GtkTreeItem *p;
p = findGtkTreeItem(info.m_itemId);
p = findGtkTreeItem(info.m_itemId);
if (p == NULL) {
wxLogSysError("TreeCtrl::SetItem failed");
return FALSE;
}
if (p == NULL)
{
wxLogSysError("TreeCtrl::SetItem failed");
return false;
}
wxConvertToGtkTreeItem(this, info, &p);
wxConvertToGtkTreeItem(this, info, &p);
return TRUE;
return true;
}
int wxTreeCtrl::GetItemState(long item, long stateMask) const {
@@ -797,30 +802,32 @@ int wxTreeCtrl::GetItemState(long item, long stateMask) const {
return info.m_state;
}
bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) {
wxTreeItem info;
bool wxTreeCtrl::SetItemState(long item, long state, long stateMask)
{
wxTreeItem info;
info.m_mask = wxTREE_MASK_STATE ;
info.m_state = state;
info.m_stateMask = stateMask;
info.m_itemId = item;
info.m_mask = wxTREE_MASK_STATE ;
info.m_state = state;
info.m_stateMask = stateMask;
info.m_itemId = item;
return SetItem(info);
return SetItem(info);
}
*/
// Operations
/*
bool wxTreeCtrl::DeleteChildren(long item) {
GtkTreeItem *p;
bool wxTreeCtrl::DeleteChildren(long item)
{
GtkTreeItem *p;
p = findGtkTreeItem(item);
if (p == NULL)
return FALSE;
p = findGtkTreeItem(item);
if (p == NULL)
return false;
gtk_tree_item_remove_subtree(GTK_TREE_ITEM(p));
gtk_tree_item_remove_subtree(GTK_TREE_ITEM(p));
return TRUE;
return true;
}
*/

5
src/gtk/window.cpp
View File

@@ -27,6 +27,7 @@
#include "wx/dialog.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/textctrl.h"
#endif
#include "wx/layout.h"
@@ -49,10 +50,6 @@
#include "wx/caret.h"
#endif // wxUSE_CARET
#if wxUSE_TEXTCTRL
#include "wx/textctrl.h"
#endif
#include "wx/statusbr.h"
#include "wx/fontutil.h"

3
src/gtk1/combobox.cpp
View File

@@ -17,12 +17,11 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/settings.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#endif
#include "wx/arrstr.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#include "wx/gtk1/private.h"
//-----------------------------------------------------------------------------

2
src/gtk1/spinctrl.cpp
View File

@@ -17,9 +17,9 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#endif
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#include "wx/math.h"
#include "wx/gtk1/private.h"

95
src/gtk1/treegtk.cpp
View File

@@ -19,10 +19,10 @@
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/log.h"
#include "wx/textctrl.h"
#endif
#include "wx/gtk1/treectrl.h"
#include "wx/textctrl.h"
#include <gtk/gtk.h>
@@ -103,7 +103,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
if (y < 0)
y = 0;
m_needParent = TRUE;
m_needParent = true;
printf("precreate\n");
PreCreation( parent, id, pos, size, style, name );
@@ -133,7 +133,7 @@ printf("postcreate\n");
gtk_widget_realize(GTK_WIDGET(m_tree));
Show(TRUE);
Show(true);
return TRUE;
}
@@ -728,62 +728,68 @@ long wxTreeCtrl::GetChild(long item) const {
return (-1);
}
long wxTreeCtrl::GetFirstVisibleItem(void) const {
GtkTreeItem *next = NULL;
long wxTreeCtrl::GetFirstVisibleItem(void) const
{
GtkTreeItem *next = NULL;
GList *list = gtk_container_children(GTK_CONTAINER(m_anchor));
next = GTK_TREE_ITEM(list->data);
GList *list = gtk_container_children(GTK_CONTAINER(m_anchor));
next = GTK_TREE_ITEM(list->data);
// gtk_container_foreach(GTK_CONTAINER(m_anchor), gtk_treectrl_next_visible_callback, &next);
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
return (-1);
return wxNOT_FOUND;
}
long wxTreeCtrl::GetNextVisibleItem(long item) const {
GtkTreeItem *p;
GtkTreeItem *next = NULL;
long wxTreeCtrl::GetNextVisibleItem(long item) const
{
GtkTreeItem *p;
GtkTreeItem *next = NULL;
p = findGtkTreeItem(item);
GList *list = gtk_container_children(GTK_CONTAINER(p));
next = GTK_TREE_ITEM(list->data);
p = findGtkTreeItem(item);
GList *list = gtk_container_children(GTK_CONTAINER(p));
next = GTK_TREE_ITEM(list->data);
// gtk_container_foreach(GTK_CONTAINER(p), gtk_treectrl_next_visible_callback, &next);
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
return (-1);
return wxNOT_FOUND;
}
bool wxTreeCtrl::GetItem(wxTreeItem& info) const {
GtkTreeItem *p;
bool wxTreeCtrl::GetItem(wxTreeItem& info) const
{
GtkTreeItem *p;
p = findGtkTreeItem(info.m_itemId);
p = findGtkTreeItem(info.m_itemId);
if (p == NULL) {
wxLogSysError("TreeCtrl::GetItem failed");
return FALSE;
}
if (p == NULL)
{
wxLogSysError("TreeCtrl::GetItem failed");
return false;
}
wxConvertFromGtkTreeItem(info, p);
wxConvertFromGtkTreeItem(info, p);
return TRUE;
return true;
}
bool wxTreeCtrl::SetItem(wxTreeItem& info) {
GtkTreeItem *p;
bool wxTreeCtrl::SetItem(wxTreeItem& info)
{
GtkTreeItem *p;
p = findGtkTreeItem(info.m_itemId);
p = findGtkTreeItem(info.m_itemId);
if (p == NULL) {
wxLogSysError("TreeCtrl::SetItem failed");
return FALSE;
}
if (p == NULL)
{
wxLogSysError("TreeCtrl::SetItem failed");
return false;
}
wxConvertToGtkTreeItem(this, info, &p);
wxConvertToGtkTreeItem(this, info, &p);
return TRUE;
return true;
}
int wxTreeCtrl::GetItemState(long item, long stateMask) const {
@@ -813,16 +819,17 @@ bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) {
// Operations
/*
bool wxTreeCtrl::DeleteChildren(long item) {
GtkTreeItem *p;
bool wxTreeCtrl::DeleteChildren(long item)
{
GtkTreeItem *p;
p = findGtkTreeItem(item);
if (p == NULL)
return FALSE;
p = findGtkTreeItem(item);
if (p == NULL)
return false;
gtk_tree_item_remove_subtree(GTK_TREE_ITEM(p));
gtk_tree_item_remove_subtree(GTK_TREE_ITEM(p));
return TRUE;
return true;
}
*/

5
src/gtk1/window.cpp
View File

@@ -27,6 +27,7 @@
#include "wx/dialog.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/textctrl.h"
#endif
#include "wx/layout.h"
@@ -45,10 +46,6 @@
#include "wx/caret.h"
#endif // wxUSE_CARET
#if wxUSE_TEXTCTRL
#include "wx/textctrl.h"
#endif
#include "wx/statusbr.h"
#include "wx/fontutil.h"

2
src/html/helpfrm.cpp
View File

@@ -36,11 +36,11 @@
#include "wx/menu.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/textctrl.h"
#endif // WXPRECOMP
#include "wx/html/helpfrm.h"
#include "wx/html/helpctrl.h"
#include "wx/textctrl.h"
#include "wx/notebook.h"
#include "wx/imaglist.h"
#include "wx/treectrl.h"

2
src/html/helpwnd.cpp
View File

@@ -36,12 +36,12 @@
#include "wx/menu.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/textctrl.h"
#endif // WXPRECOMP
#include "wx/html/helpfrm.h"
#include "wx/html/helpdlg.h"
#include "wx/html/helpctrl.h"
#include "wx/textctrl.h"
#include "wx/notebook.h"
#include "wx/imaglist.h"
#include "wx/treectrl.h"

2
src/mac/carbon/app.cpp
View File

@@ -29,13 +29,13 @@
#include "wx/cursor.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#include "wx/textctrl.h"
#endif
#include "wx/gdicmn.h"
#include "wx/module.h"
#include "wx/memory.h"
#include "wx/tooltip.h"
#include "wx/textctrl.h"
#include "wx/docview.h"
#include "wx/filename.h"

52
src/mac/carbon/spinctrl.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: spinbutt.cpp
// Name: src/mac/carbon/spinbutt.cpp
// Purpose: wxSpinCtrl
// Author: Robert
// Modified by: Mark Newsam (Based on GTK file)
@@ -13,8 +13,12 @@
#if wxUSE_SPINCTRL
#include "wx/spinbutt.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif
#include "wx/spinctrl.h"
#include "wx/textctrl.h"
#include "wx/containr.h"
// ----------------------------------------------------------------------------
@@ -38,7 +42,7 @@ public:
: wxTextCtrl(spin , -1, value, wxDefaultPosition, wxSize(40, -1))
{
m_spin = spin;
// remove the default minsize, the spinctrl will have one instead
SetSizeHints(-1,-1);
}
@@ -47,7 +51,7 @@ public:
{
// Hand button down events to wxSpinCtrl. Doesn't work.
if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event ))
return TRUE;
return true;
return wxTextCtrl::ProcessEvent( event );
}
@@ -137,9 +141,9 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
WX_EVENT_TABLE_CONTROL_CONTAINER(wxSpinCtrl)
WX_EVENT_TABLE_CONTROL_CONTAINER(wxSpinCtrl)
END_EVENT_TABLE()
WX_DELEGATE_TO_CONTROL_CONTAINER(wxSpinCtrl)
@@ -192,7 +196,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
wxSize csize = size ;
m_text = new wxSpinCtrlText(this, value);
m_btn = new wxSpinCtrlButton(this, style);
m_btn->SetRange(min, max);
m_btn->SetValue(initial);
@@ -201,17 +205,17 @@ bool wxSpinCtrl::Create(wxWindow *parent,
}
if ( size.y == -1 ) {
csize.y = m_text->GetSize().y + 2 * TEXTBORDER ; //allow for text border highlights
if ( m_btn->GetSize().y > csize.y )
csize.y = m_btn->GetSize().y ;
csize.y = m_text->GetSize().y + 2 * TEXTBORDER ; //allow for text border highlights
if ( m_btn->GetSize().y > csize.y )
csize.y = m_btn->GetSize().y ;
}
//SetSize(csize);
//MacPostControlCreate(pos, csize);
SetInitialBestSize(csize);
return TRUE;
return true;
}
wxSpinCtrl::~wxSpinCtrl()
@@ -233,7 +237,7 @@ wxSize wxSpinCtrl::DoGetBestSize() const
{
if (!m_btn || !m_text)
return GetSize();
wxSize sizeBtn = m_btn->GetBestSize(),
sizeText = m_text->GetBestSize();
@@ -245,7 +249,7 @@ wxSize wxSpinCtrl::DoGetBestSize() const
height = sizeText.y;
else
height = sizeBtn.y;
return wxSize(sizeBtn.x + sizeText.x + MARGIN, height );
}
@@ -254,11 +258,11 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
// position the subcontrols inside the client area
wxSize sizeBtn = m_btn->GetSize();
wxSize sizeText = m_text->GetSize();
wxControl::DoMoveWindow(x, y, width, height);
wxCoord wText = width - sizeBtn.x - MARGIN - 2 * TEXTBORDER;
m_text->SetSize(TEXTBORDER, (height - sizeText.y) / 2, wText, -1);
m_btn->SetSize(0 + wText + MARGIN + 2 * TEXTBORDER , (height - sizeBtn.y) / 2 , -1, -1 );
}
@@ -270,15 +274,15 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
bool wxSpinCtrl::Enable(bool enable)
{
if ( !wxControl::Enable(enable) )
return FALSE;
return TRUE;
return false;
return true;
}
bool wxSpinCtrl::Show(bool show)
{
if ( !wxControl::Show(show) )
return FALSE;
return TRUE;
return false;
return true;
}
// ----------------------------------------------------------------------------
@@ -302,7 +306,7 @@ bool wxSpinCtrl::GetTextValue(int *val) const
*val = l;
return TRUE;
return true;
}
int wxSpinCtrl::GetValue() const
@@ -375,9 +379,9 @@ void wxSpinCtrl::SetSelection(long from, long to)
// be selected
if ( (from == -1) && (to == -1) )
{
from = 0;
from = 0;
}
m_text->SetSelection(from, to);
}
}
#endif // wxUSE_SPINCTRL

2
src/mac/carbon/window.cpp
View File

@@ -28,6 +28,7 @@
#include "wx/msgdlg.h"
#include "wx/scrolbar.h"
#include "wx/statbox.h"
#include "wx/textctrl.h"
#endif
#include "wx/layout.h"
@@ -36,7 +37,6 @@
#include "wx/menuitem.h"
#include "wx/spinctrl.h"
#include "wx/geometry.h"
#include "wx/textctrl.h"
#include "wx/toolbar.h"

2
src/mac/classic/app.cpp
View File

@@ -33,13 +33,13 @@
#include "wx/cursor.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#include "wx/textctrl.h"
#endif
#include "wx/gdicmn.h"
#include "wx/module.h"
#include "wx/memory.h"
#include "wx/tooltip.h"
#include "wx/textctrl.h"
#include "wx/docview.h"
#include "wx/filename.h"

6
src/mac/classic/spinctrl.cpp
View File

@@ -16,15 +16,13 @@
#if wxUSE_SPINCTRL
#include "wx/spinctrl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif //WX_PRECOMP
#include "wx/spinbutt.h"
#include "wx/spinctrl.h"
#include "wx/spinctrl.h"
// ----------------------------------------------------------------------------
// constants

2
src/msw/listctrl.cpp
View File

@@ -32,9 +32,9 @@
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
#include "wx/textctrl.h"
#endif
#include "wx/textctrl.h"
#include "wx/imaglist.h"
#include "wx/listctrl.h"

4
src/msw/window.cpp
View File

@@ -46,6 +46,7 @@
#include "wx/sizer.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/textctrl.h"
#endif
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
@@ -89,7 +90,6 @@
#include "wx/spinctrl.h"
#endif // wxUSE_SPINCTRL
#include "wx/textctrl.h"
#include "wx/notebook.h"
#include "wx/listctrl.h"
@@ -3393,7 +3393,7 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
// Truncate tooltip length if needed as otherwise we might not have
// enough space for it in the buffer and MultiByteToWideChar() would
// return an error
size_t tipLength = wxMin(ttip.Len(), WXSIZEOF(buf) - 1);
size_t tipLength = wxMin(ttip.length(), WXSIZEOF(buf) - 1);
// Convert to WideChar without adding the NULL character. The NULL
// character is added afterwards (this is more efficient).

439
src/os2/listctrl.cpp
View File

@@ -32,9 +32,9 @@
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
#include "wx/textctrl.h"
#endif
#include "wx/textctrl.h"
#include "wx/imaglist.h"
#include "wx/listctrl.h"
@@ -487,14 +487,12 @@ SHORT EXPENTRY InternalDataCompareFunc (
// none
//
/////////////////////////////////////////////////////////////////////////////
void ConvertFromOS2ListItem (
HWND hWndListCtrl
, wxListItem& rInfo
, PMYRECORD pRecord
)
void ConvertFromOS2ListItem ( HWND hWndListCtrl,
wxListItem& rInfo,
PMYRECORD pRecord )
{
CListItemInternalData* pInternaldata = (CListItemInternalData *)pRecord->m_ulUserData;
bool bNeedText = FALSE;
CListItemInternalData* pInternaldata = (CListItemInternalData *)pRecord->m_ulUserData;
bool bNeedText = false;
if (pInternaldata)
rInfo.SetData(pInternaldata->m_lParam);
@@ -826,30 +824,28 @@ void wxListCtrl::Init ()
m_pImageListNormal = NULL;
m_pImageListSmall = NULL;
m_pImageListState = NULL;
m_bOwnsImageListNormal = FALSE;
m_bOwnsImageListSmall = FALSE;
m_bOwnsImageListState = FALSE;
m_bOwnsImageListNormal = false;
m_bOwnsImageListSmall = false;
m_bOwnsImageListState = false;
m_lBaseStyle = 0L;
m_nColCount = 0;
m_pTextCtrl = NULL;
m_bAnyInternalData = FALSE;
m_bHasAnyAttr = FALSE;
m_bAnyInternalData = false;
m_bHasAnyAttr = false;
} // end of wxListCtrl::Init
bool wxListCtrl::Create (
wxWindow* pParent
, wxWindowID vId
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
, const wxValidator& rValidator
, const wxString& rsName
)
bool wxListCtrl::Create ( wxWindow* pParent,
wxWindowID vId,
const wxPoint& rPos,
const wxSize& rSize,
long lStyle,
const wxValidator& rValidator,
const wxString& rsName )
{
int nX = rPos.x;
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
int nX = rPos.x;
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
#if wxUSE_VALIDATORS
SetValidator(rValidator);
@@ -869,7 +865,7 @@ bool wxListCtrl::Create (
m_windowId = (vId == -1) ? NewControlId() : vId;
long lSstyle = WS_VISIBLE | WS_TABSTOP;
long lSstyle = WS_VISIBLE | WS_TABSTOP;
if (GetWindowStyleFlag() & wxCLIP_SIBLINGS)
lSstyle |= WS_CLIPSIBLINGS;
@@ -879,23 +875,19 @@ bool wxListCtrl::Create (
,nWidth
,nHeight
))
return FALSE;
return false;
if (pParent)
pParent->AddChild(this);
return TRUE;
return true;
} // end of wxListCtrl::Create
bool wxListCtrl::DoCreateControl (
int nX
, int nY
, int nWidth
, int nHeight
)
bool wxListCtrl::DoCreateControl ( int nX, int nY,
int nWidth, int nHeight )
{
DWORD lWstyle = m_lBaseStyle;
long lOldStyle = 0; // Dummy
DWORD lWstyle = m_lBaseStyle;
long lOldStyle = 0; // Dummy
CNRINFO vCnrInfo;
CNRINFO vCnrInfo;
lWstyle |= ConvertToOS2Style( lOldStyle
,GetWindowStyleFlag()
@@ -914,7 +906,7 @@ bool wxListCtrl::DoCreateControl (
);
if (!m_hWnd)
{
return FALSE;
return false;
}
//
@@ -925,7 +917,7 @@ bool wxListCtrl::DoCreateControl (
,MPFROMP(&vCnrInfo)
,(MPARAM)(USHORT)sizeof(CNRINFO)
))
return FALSE;
return false;
lWstyle = ConvertViewToOS2Style(GetWindowStyleFlag());
vCnrInfo.flWindowAttr |= lWstyle;
if (!::WinSendMsg( GetHWND()
@@ -933,7 +925,7 @@ bool wxListCtrl::DoCreateControl (
,MPFROMP(&vCnrInfo)
,(MPARAM)CMA_FLWINDOWATTR
))
return FALSE;
return false;
//
// And now set needed arrangement flags
@@ -944,36 +936,30 @@ bool wxListCtrl::DoCreateControl (
,(MPARAM)CMA_ARRANGEGRID
,(MPARAM)lWstyle
))
return FALSE;
return false;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(GetParent()->GetForegroundColour());
SubclassWin(m_hWnd);
SetFont(*wxSMALL_FONT);
SetXComp(0);
SetYComp(0);
SetSize( nX
,nY
,nWidth
,nHeight
);
return TRUE;
SetSize( nX, nY, nWidth, nHeight );
return true;
} // end of wxListCtrl::DoCreateControl
void wxListCtrl::UpdateStyle ()
{
if (GetHWND())
{
long lDummy;
DWORD dwStyleNew = ConvertToOS2Style( lDummy
,GetWindowStyleFlag()
);
long lDummy;
DWORD dwStyleNew = ConvertToOS2Style( lDummy, GetWindowStyleFlag() );
dwStyleNew |= m_lBaseStyle;
//
// Get the current window style.
//
ULONG dwStyleOld = ::WinQueryWindowULong(GetHWND(), QWL_STYLE);
ULONG dwStyleOld = ::WinQueryWindowULong(GetHWND(), QWL_STYLE);
//
// Only set the window style if the view bits have changed.
@@ -989,12 +975,12 @@ void wxListCtrl::FreeAllInternalData ()
{
if (m_bAnyInternalData)
{
int n = GetItemCount();
int i = 0;
int n = GetItemCount();
int i = 0;
for (i = 0; i < n; i++)
DeleteInternalData(this, (long)i);
m_bAnyInternalData = FALSE;
m_bAnyInternalData = false;
}
} // end of wxListCtrl::FreeAllInternalData
@@ -1149,57 +1135,48 @@ long wxListCtrl::ConvertViewToOS2Style (
// ----------------------------------------------------------------------------
// Sets the foreground, i.e. text, colour
bool wxListCtrl::SetForegroundColour (
const wxColour& rCol)
bool wxListCtrl::SetForegroundColour (const wxColour& rCol)
{
ULONG ulColor = wxColourToRGB(rCol);
ULONG ulColor = wxColourToRGB(rCol);
if (!wxWindow::SetForegroundColour(rCol))
return FALSE;
return false;
::WinSetPresParam( GetHWND()
,PP_FOREGROUNDCOLOR
,sizeof(ULONG)
,&ulColor
);
return TRUE;
return true;
} // end of wxListCtrl::SetForegroundColour
// Sets the background colour
bool wxListCtrl::SetBackgroundColour (
const wxColour& rCol
)
bool wxListCtrl::SetBackgroundColour ( const wxColour& rCol )
{
if (!wxWindow::SetBackgroundColour(rCol))
return FALSE;
return false;
//
// We set the same colour for both the "empty" background and the items
// background
//
ULONG ulColor = wxColourToRGB(rCol);
ULONG ulColor = wxColourToRGB(rCol);
::WinSetPresParam( GetHWND()
,PP_BACKGROUNDCOLOR
,sizeof(ULONG)
,&ulColor
);
return TRUE;
return true;
} // end of wxListCtrl::SetBackgroundColour
// Gets information about this column
bool wxListCtrl::GetColumn (
int nCol
, wxListItem& rItem
) const
bool wxListCtrl::GetColumn ( int nCol, wxListItem& rItem ) const
{
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND()
,nCol
);
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND(), nCol );
if (!pFieldInfo)
return FALSE;
return false;
rItem.SetWidth(pFieldInfo->cxWidth);
if ((rItem.GetMask() & wxLIST_MASK_TEXT) &&
(pFieldInfo->flData & CFA_STRING) &&
@@ -1216,37 +1193,25 @@ bool wxListCtrl::GetColumn (
else if (pFieldInfo->flData & CFA_CENTER)
rItem.m_format = wxLIST_FORMAT_CENTRE;
}
return TRUE;
return true;
} // end of wxListCtrl::GetColumn
// Sets information about this column
bool wxListCtrl::SetColumn (
int nCol
, wxListItem& rItem
)
bool wxListCtrl::SetColumn ( int nCol, wxListItem& rItem )
{
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum( GetHWND()
,nCol
);
ConvertToOS2ListCol( nCol
,rItem
,pFieldInfo
);
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum( GetHWND(), nCol );
ConvertToOS2ListCol( nCol, rItem, pFieldInfo );
//
// Since we changed the field pointed to, we invalidate to see the result
//
::WinSendMsg(GetHWND(), CM_INVALIDATEDETAILFIELDINFO, NULL, NULL);
return TRUE;
return true;
} // end of wxListCtrl::SetColumn
// Gets the column width
int wxListCtrl::GetColumnWidth (
int nCol
) const
int wxListCtrl::GetColumnWidth ( int nCol ) const
{
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND()
,nCol
);
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND(), nCol );
if (!pFieldInfo)
return 0;
@@ -1254,23 +1219,18 @@ int wxListCtrl::GetColumnWidth (
} // end of wxListCtrl::GetColumnWidth
// Sets the column width
bool wxListCtrl::SetColumnWidth (
int nCol
, int nWidth
)
bool wxListCtrl::SetColumnWidth ( int nCol, int nWidth )
{
int nCol2 = nCol;
int nWidth2 = nWidth;
int nCol2 = nCol;
int nWidth2 = nWidth;
if (GetWindowStyleFlag() & wxLC_LIST)
nCol2 = -1;
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum( GetHWND()
,nCol
);
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum( GetHWND(), nCol );
pFieldInfo->cxWidth = nWidth;
::WinSendMsg(GetHWND(), CM_INVALIDATEDETAILFIELDINFO, NULL, NULL);
return TRUE;
return true;
} // end of wxListCtrl::SetColumnWidth
// Gets the number of items that can fit vertically in the
@@ -1328,35 +1288,22 @@ wxTextCtrl* wxListCtrl::GetEditControl() const
}
// Gets information about the item
bool wxListCtrl::GetItem (
wxListItem& rInfo
) const
bool wxListCtrl::GetItem ( wxListItem& rInfo ) const
{
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND()
,rInfo.GetId()
);
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), rInfo.GetId() );
//
// Give NULL as hwnd as we already have everything we need
//
ConvertFromOS2ListItem( NULL
,rInfo
,pRecord
);
return TRUE;
ConvertFromOS2ListItem( NULL, rInfo, pRecord );
return true;
} // end of wxListCtrl::GetItem
// Sets information about the item
bool wxListCtrl::SetItem (
wxListItem& rInfo
)
bool wxListCtrl::SetItem ( wxListItem& rInfo )
{
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND()
,rInfo.GetColumn()
);
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND()
,rInfo.GetId()
);
PFIELDINFO pFieldInfo = FindOS2ListFieldByColNum ( GetHWND(), rInfo.GetColumn() );
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), rInfo.GetId() );
ConvertToOS2ListItem( this
,rInfo
@@ -1382,7 +1329,7 @@ bool wxListCtrl::SetItem (
//
// Need to set it
//
m_bAnyInternalData = TRUE;
m_bAnyInternalData = true;
pData = new CListItemInternalData();
pRecord->m_ulUserData = (unsigned long)pData;
};
@@ -1407,19 +1354,19 @@ bool wxListCtrl::SetItem (
//
// We need to update the item immediately to show the new image
//
bool bUpdateNow = (rInfo.GetMask() & wxLIST_MASK_IMAGE) != 0;
bool bUpdateNow = (rInfo.GetMask() & wxLIST_MASK_IMAGE) != 0;
//
// Check whether it has any custom attributes
//
if (rInfo.HasAttributes())
{
m_bHasAnyAttr = TRUE;
m_bHasAnyAttr = true;
//
// If the colour has changed, we must redraw the item
//
bUpdateNow = TRUE;
bUpdateNow = true;
}
if (::WinIsWindowVisible(GetHWND()))
{
@@ -1435,7 +1382,7 @@ bool wxListCtrl::SetItem (
,NULL
,NULL
);
return TRUE;
return true;
} // end of wxListCtrl::SetItem
long wxListCtrl::SetItem (
@@ -1477,23 +1424,15 @@ int wxListCtrl::GetItemState (
} // end of wxListCtrl::GetItemState
// Sets the item state
bool wxListCtrl::SetItemState (
long lItem
, long lState
, long lStateMask
)
bool wxListCtrl::SetItemState ( long lItem, long lState, long lStateMask )
{
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND()
,lItem
);
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), lItem );
//
// Don't use SetItem() here as it doesn't work with the virtual list
// controls
//
ConvertToOS2Flags( lState
,pRecord
);
ConvertToOS2Flags( lState, pRecord );
//
// for the virtual list controls we need to refresh the previously focused
@@ -1535,7 +1474,7 @@ bool wxListCtrl::SetItemState (
RefreshItem(lFocusOld);
}
}
return TRUE;
return true;
} // end of wxListCtrl::SetItemState
// Sets the item image
@@ -1620,22 +1559,18 @@ bool wxListCtrl::SetItemData (
} // end of wxListCtrl::SetItemData
// Gets the item rectangle
bool wxListCtrl::GetItemRect (
long lItem
, wxRect& rRect
, int nCode
) const
bool wxListCtrl::GetItemRect ( long lItem,
wxRect& rRect,
int nCode ) const
{
bool bSuccess;
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND()
,lItem
);
QUERYRECORDRECT vQueryRect;
RECTL vRect;
int nHeight;
bool bSuccess;
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), lItem );
QUERYRECORDRECT vQueryRect;
RECTL vRect;
int nHeight;
if (!pRecord)
return FALSE;
return false;
vQueryRect.cb = sizeof(QUERYRECORDRECT);
vQueryRect.pRecord = &pRecord->m_vRecord;
vQueryRect.fRightSplitWindow = TRUE;
@@ -1648,33 +1583,26 @@ bool wxListCtrl::GetItemRect (
//
// remember OS/2 is backwards
//
GetClientSize( NULL
,&nHeight
);
GetClientSize( NULL, &nHeight );
rRect.x = vRect.xLeft;
rRect.y = nHeight - vRect.yTop;
rRect.width = vRect.xRight;
rRect.height = nHeight - vRect.yBottom;
bSuccess = TRUE;
bSuccess = true;
return bSuccess;
} // end of wxListCtrl::GetItemRect
// Gets the item position
bool wxListCtrl::GetItemPosition (
long lItem
, wxPoint& rPos
) const
bool wxListCtrl::GetItemPosition ( long lItem, wxPoint& rPos ) const
{
bool bSuccess;
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND()
,lItem
);
QUERYRECORDRECT vQueryRect;
RECTL vRect;
int nHeight;
bool bSuccess;
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND() , lItem );
QUERYRECORDRECT vQueryRect;
RECTL vRect;
int nHeight;
if (!pRecord)
return FALSE;
return false;
vQueryRect.cb = sizeof(QUERYRECORDRECT);
vQueryRect.pRecord = &pRecord->m_vRecord;
vQueryRect.fRightSplitWindow = TRUE;
@@ -1687,25 +1615,20 @@ bool wxListCtrl::GetItemPosition (
//
// remember OS/2 is backwards
//
GetClientSize( NULL
,&nHeight
);
GetClientSize( NULL, &nHeight );
rPos.x = vRect.xLeft;
rPos.y = nHeight - vRect.yTop;
bSuccess = TRUE;
bSuccess = true;
return bSuccess;
} // end of wxListCtrl::GetItemPosition
// Sets the item position.
bool wxListCtrl::SetItemPosition (
long lItem
, const wxPoint& rPos
)
bool wxListCtrl::SetItemPosition ( long lItem, const wxPoint& rPos )
{
//
// Items cannot be positioned in X/Y coord in OS/2
//
return FALSE;
return false;
} // end of wxListCtrl::SetItemPosition
// Gets the number of items in the list control
@@ -1723,11 +1646,9 @@ int wxListCtrl::GetItemCount () const
} // end of wxListCtrl::GetItemCount
// Retrieves the spacing between icons in pixels.
// If small is TRUE, gets the spacing for the small icon
// If bIsSmall is true, gets the spacing for the small icon
// view, otherwise the large icon view.
int wxListCtrl::GetItemSpacing (
bool bIsSmall
) const
int wxListCtrl::GetItemSpacing ( bool bIsSmall ) const
{
CNRINFO vCnrInfo;
@@ -1916,48 +1837,42 @@ wxImageList* wxListCtrl::GetImageList (
return NULL;
} // end of wxListCtrl::GetImageList
void wxListCtrl::SetImageList (
wxImageList* pImageList
, int nWhich
)
void wxListCtrl::SetImageList ( wxImageList* pImageList,
int nWhich )
{
if (nWhich == wxIMAGE_LIST_NORMAL)
{
if (m_bOwnsImageListNormal)
delete m_pImageListNormal;
m_pImageListNormal = pImageList;
m_bOwnsImageListNormal = FALSE;
m_bOwnsImageListNormal = false;
}
else if (nWhich == wxIMAGE_LIST_SMALL)
{
if (m_bOwnsImageListSmall)
delete m_pImageListSmall;
m_pImageListSmall = pImageList;
m_bOwnsImageListSmall = FALSE;
m_bOwnsImageListSmall = false;
}
else if (nWhich == wxIMAGE_LIST_STATE)
{
if (m_bOwnsImageListState)
delete m_pImageListState;
m_pImageListState = pImageList;
m_bOwnsImageListState = FALSE;
m_bOwnsImageListState = false;
}
} // end of wxListCtrl::SetImageList
void wxListCtrl::AssignImageList (
wxImageList* pImageList
, int nWhich
)
void wxListCtrl::AssignImageList ( wxImageList* pImageList, int nWhich )
{
SetImageList( pImageList
,nWhich
);
SetImageList( pImageList, nWhich );
if (nWhich == wxIMAGE_LIST_NORMAL )
m_bOwnsImageListNormal = TRUE;
m_bOwnsImageListNormal = true;
else if (nWhich == wxIMAGE_LIST_SMALL )
m_bOwnsImageListSmall = TRUE;
m_bOwnsImageListSmall = true;
else if (nWhich == wxIMAGE_LIST_STATE )
m_bOwnsImageListState = TRUE;
m_bOwnsImageListState = true;
} // end of wxListCtrl::AssignImageList
// ----------------------------------------------------------------------------
@@ -1965,12 +1880,10 @@ void wxListCtrl::AssignImageList (
// ----------------------------------------------------------------------------
// Arranges the items
bool wxListCtrl::Arrange (
int nFlag
)
bool wxListCtrl::Arrange ( int nFlag )
{
ULONG ulType = 0L;
ULONG ulFlags = 0L;
ULONG ulType = 0L;
ULONG ulFlags = 0L;
if (nFlag == wxLIST_ALIGN_SNAP_TO_GRID)
{
@@ -1992,24 +1905,20 @@ bool wxListCtrl::Arrange (
//
// We do not support CMA_ARRANGESELECTED
//
return TRUE;
return true;
} // end of wxListCtrl::Arrange
// Deletes an item
bool wxListCtrl::DeleteItem (
long lItem
)
bool wxListCtrl::DeleteItem ( long lItem )
{
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND()
,lItem
);
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), lItem );
if (LONGFROMMR(::WinSendMsg( GetHWND()
,CM_REMOVERECORD
,(MPARAM)pRecord
,MPFROM2SHORT(1, CMA_FREE)
)) == -1L)
{
return FALSE;
return false;
}
//
@@ -2038,7 +1947,7 @@ bool wxListCtrl::DeleteItem (
vRectWin.y = vRectItem.GetBottom();
RefreshRect(vRectWin);
}
return TRUE;
return true;
} // end of wxListCtrl::DeleteItem
// Deletes all items
@@ -2061,18 +1970,14 @@ bool wxListCtrl::DeleteAllColumns ()
}
wxASSERT_MSG(m_nColCount == 0, wxT("no columns should be left"));
return TRUE;
return true;
} // end of wxListCtrl::DeleteAllColumns
// Deletes a column
bool wxListCtrl::DeleteColumn (
int nCol
)
bool wxListCtrl::DeleteColumn ( int nCol )
{
bool bSuccess = FALSE;
PFIELDINFO pField = FindOS2ListFieldByColNum( GetHWND()
,nCol
);
bool bSuccess = false;
PFIELDINFO pField = FindOS2ListFieldByColNum( GetHWND(), nCol );
bSuccess = ((LONG)::WinSendMsg( GetHWND()
,CM_REMOVEDETAILFIELDINFO
,MPFROMP(pField)
@@ -2123,32 +2028,26 @@ wxTextCtrl* wxListCtrl::EditLabel (
// End label editing, optionally cancelling the edit. Under OS/2 you close
// the record for editting
bool wxListCtrl::EndEditLabel (
bool WXUNUSED(bCancel)
)
bool wxListCtrl::EndEditLabel ( bool WXUNUSED(bCancel) )
{
::WinSendMsg( GetHWND()
,CM_CLOSEEDIT
,(MPARAM)0
,(MPARAM)0
);
return TRUE;
return true;
} // end of wxListCtrl::EndEditLabel
// Ensures this item is visible
bool wxListCtrl::EnsureVisible (
long lItem
)
bool wxListCtrl::EnsureVisible ( long lItem )
{
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND()
,lItem
);
PMYRECORD pRecord = FindOS2ListRecordByID( GetHWND(), lItem );
::WinSendMsg( GetHWND()
,CM_INVALIDATERECORD
,MPFROMP(pRecord)
,MPFROM2SHORT((SHORT)1, CMA_NOREPOSITION)
);
return TRUE;
return true;
} // end of wxListCtrl::EnsureVisible
// Find an item whose label matches this string, starting from the item after 'start'
@@ -2390,7 +2289,7 @@ long wxListCtrl::InsertItem (
);
if (bNeedInternalData)
{
m_bAnyInternalData = TRUE;
m_bAnyInternalData = true;
//
// Internal stucture that manages data
@@ -2536,10 +2435,7 @@ long wxListCtrl::InsertColumn (
// scroll the control by the given number of pixels (exception: in list view,
// dx is interpreted as number of columns)
bool wxListCtrl::ScrollList (
int nDx
, int nDy
)
bool wxListCtrl::ScrollList ( int nDx, int nDy )
{
if (nDx > 0)
::WinSendMsg( GetHWND()
@@ -2553,15 +2449,12 @@ bool wxListCtrl::ScrollList (
,(MPARAM)CMA_VERTICAL
,(MPARAM)nDy
);
return TRUE;
return true;
} // end of wxListCtrl::ScrollList
bool wxListCtrl::SortItems (
wxListCtrlCompare fn
, long lData
)
bool wxListCtrl::SortItems ( wxListCtrlCompare fn, long lData )
{
SInternalDataSort vInternalData;
SInternalDataSort vInternalData;
vInternalData.m_fnUser = fn;
vInternalData.m_lData = lData;
@@ -2574,47 +2467,38 @@ bool wxListCtrl::SortItems (
))
{
wxLogDebug(_T("CM_SORTRECORD failed"));
return FALSE;
return false;
}
return TRUE;
return true;
} // end of wxListCtrl::SortItems
// ----------------------------------------------------------------------------
// message processing
// ----------------------------------------------------------------------------
bool wxListCtrl::OS2Command (
WXUINT uCmd
, WXWORD wId
)
bool wxListCtrl::OS2Command ( WXUINT uCmd, WXWORD wId )
{
if (uCmd == CN_ENDEDIT)
{
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED
,wId
);
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED, wId );
vEvent.SetEventObject( this );
ProcessCommand(vEvent);
return TRUE;
return true;
}
else if (uCmd == CN_KILLFOCUS)
{
wxCommandEvent vEvent( wxEVT_KILL_FOCUS
,wId
);
wxCommandEvent vEvent( wxEVT_KILL_FOCUS, wId );
vEvent.SetEventObject( this );
ProcessCommand(vEvent);
return TRUE;
return true;
}
else
return FALSE;
return false;
} // end of wxListCtrl::OS2Command
// Necessary for drawing hrules and vrules, if specified
void wxListCtrl::OnPaint (
wxPaintEvent& rEvent
)
void wxListCtrl::OnPaint ( wxPaintEvent& rEvent )
{
wxPaintDC vDc(this);
wxPen vPen(wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT)
@@ -2775,34 +2659,25 @@ void wxListCtrl::RefreshItem (
RefreshRect(vRect);
} // end of wxListCtrl::RefreshItem
void wxListCtrl::RefreshItems (
long lItemFrom
, long lItemTo
)
void wxListCtrl::RefreshItems ( long lItemFrom, long lItemTo )
{
wxRect vRect1;
wxRect vRect2;
wxRect vRect1;
wxRect vRect2;
GetItemRect( lItemFrom
,vRect1
);
GetItemRect( lItemTo
,vRect2
);
GetItemRect( lItemFrom , vRect1 );
GetItemRect( lItemTo , vRect2 );
wxRect vRect = vRect1;
wxRect vRect = vRect1;
vRect.height = vRect2.GetBottom() - vRect1.GetTop();
RefreshRect(vRect);
} // end of wxListCtrl::RefreshItems
MRESULT wxListCtrl::OS2WindowProc(
WXUINT uMsg
, WXWPARAM wParam
, WXLPARAM lParam
)
MRESULT wxListCtrl::OS2WindowProc( WXUINT uMsg,
WXWPARAM wParam,
WXLPARAM lParam )
{
bool bProcessed = FALSE;
bool bProcessed = false;
MRESULT lRc;
wxListEvent vEvent( wxEVT_NULL
,m_windowId

4
src/os2/window.cpp
View File

@@ -46,6 +46,7 @@
#include "wx/settings.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/textctrl.h"
#include <stdio.h>
#endif
@@ -73,9 +74,6 @@
#include "wx/caret.h"
#endif // wxUSE_CARET
#include "wx/textctrl.h"
#include <string.h>
//

2
src/palmos/listctrl.cpp
View File

@@ -32,9 +32,9 @@
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
#include "wx/textctrl.h"
#endif
#include "wx/textctrl.h"
#include "wx/imaglist.h"
#include "wx/listctrl.h"

3
src/palmos/textctrl.cpp
View File

@@ -26,8 +26,9 @@
#if wxUSE_TEXTCTRL
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#include "wx/settings.h"
#include "wx/brush.h"
#include "wx/utils.h"

2
src/palmos/window.cpp
View File

@@ -44,6 +44,7 @@
#include "wx/statbox.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/textctrl.h"
#endif
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
@@ -74,7 +75,6 @@
#include "wx/spinctrl.h"
#endif // wxUSE_SPINCTRL
#include "wx/textctrl.h"
#include "wx/notebook.h"
#include "wx/listctrl.h"

6
src/univ/textctrl.cpp
View File

@@ -125,16 +125,16 @@
#if wxUSE_TEXTCTRL
#include <ctype.h>
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/dcclient.h"
#include "wx/validate.h"
#include "wx/textctrl.h"
#endif
#include <ctype.h>
#include "wx/clipbrd.h"
#include "wx/textfile.h"

10
src/xrc/xh_gdctl.cpp
View File

@@ -1,9 +1,9 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_gdctl.cpp
// Name: src/xrc/xh_gdctl.cpp
// Purpose: XRC resource for wxGenericDirCtrl
// Author: Markus Greither
// Created: 2002/01/20
// RCS-ID:
// RCS-ID: $Id$
// Copyright: (c) 2002 Markus Greither
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -17,8 +17,12 @@
#if wxUSE_XRC && wxUSE_DIRDLG
#include "wx/textctrl.h"
#include "wx/xrc/xh_gdctl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif
#include "wx/dirctrl.h"
IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler, wxXmlResourceHandler)

12
src/xrc/xh_listc.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_listc.cpp
// Name: src/xrc/xh_listc.cpp
// Purpose: XRC resource for wxListCtrl
// Author: Brian Gavin
// Created: 2000/09/09
@@ -15,10 +15,14 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XRC && wxUSE_LISTCTRL
#include "wx/textctrl.h"
#include "wx/xrc/xh_listc.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif
#include "wx/listctrl.h"
@@ -70,4 +74,4 @@ bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxListCtrl"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XRC && wxUSE_LISTCTRL

9
src/xrc/xh_text.cpp
View File

@@ -15,10 +15,13 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XRC && wxUSE_TEXTCTRL
#include "wx/xrc/xh_text.h"
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
@@ -73,4 +76,4 @@ bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxTextCtrl"));
}
#endif // wxUSE_XRC
#endif // wxUSE_XRC && wxUSE_TEXTCTRL