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

Corrected SetItemState() in listctrl

Browse Source 
Added test for this to scroll sample.
  Didn't find reason for strange positioning of
    progress dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-27 18:08:50 +00:00
parent c4208367a1
commit 00a395425c
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/scroll/scroll.cpp
View File

@@ -101,7 +101,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
wxListCtrl *m_listCtrl = new wxListCtrl( wxListCtrl *m_listCtrl = new wxListCtrl(
this, -1, wxPoint(200, 10), wxSize(180, 120), this, -1, wxPoint(200, 10), wxSize(180, 120),
wxLC_REPORT | wxSUNKEN_BORDER); wxLC_REPORT | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
m_listCtrl->InsertColumn(0, "First", wxLIST_FORMAT_LEFT, 90); m_listCtrl->InsertColumn(0, "First", wxLIST_FORMAT_LEFT, 90);
m_listCtrl->InsertColumn(1, "Last", wxLIST_FORMAT_LEFT, 90); m_listCtrl->InsertColumn(1, "Last", wxLIST_FORMAT_LEFT, 90);
@@ -112,6 +112,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
sprintf(buf, "Item %d", i); sprintf(buf, "Item %d", i);
m_listCtrl->InsertItem(i, buf); m_listCtrl->InsertItem(i, buf);
} }
m_listCtrl->SetItemState( 3, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
(void) new wxListBox( this, -1, wxPoint(200,180), wxSize(180,120), 5, choices, wxLB_ALWAYS_SB ); (void) new wxListBox( this, -1, wxPoint(200,180), wxSize(180,120), 5, choices, wxLB_ALWAYS_SB );
@@ -148,7 +149,6 @@ MyFrame::MyFrame()
: wxFrame( (wxFrame *)NULL, -1, "wxScrolledWindow sample", : wxFrame( (wxFrame *)NULL, -1, "wxScrolledWindow sample",
wxPoint(20,20), wxSize(470,360) ) wxPoint(20,20), wxSize(470,360) )
{ {
/*
wxMenu *file_menu = new wxMenu(); wxMenu *file_menu = new wxMenu();
file_menu->Append( ID_ABOUT, "&About.."); file_menu->Append( ID_ABOUT, "&About..");
file_menu->Append( ID_QUIT, "E&xit\tAlt-X"); file_menu->Append( ID_QUIT, "E&xit\tAlt-X");
@@ -162,7 +162,6 @@ MyFrame::MyFrame()
int widths[] = { -1, 100 }; int widths[] = { -1, 100 };
SetStatusWidths( 2, widths ); SetStatusWidths( 2, widths );
*/
m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) ); m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
m_canvas->SetScrollbars( 10, 10, 50, 100 ); m_canvas->SetScrollbars( 10, 10, 50, 100 );
} }

6
src/generic/listctrl.cpp
View File

@@ -1781,7 +1781,7 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
m_current = line; m_current = line;
FocusLine( m_current ); FocusLine( m_current );
RefreshLine( m_current ); RefreshLine( m_current );
RefreshLine( oldCurrent ); if (oldCurrent) RefreshLine( oldCurrent );
} }
} }
@@ -1799,9 +1799,9 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
UnfocusLine( m_current ); UnfocusLine( m_current );
m_current = line; m_current = line;
FocusLine( m_current ); FocusLine( m_current );
oldCurrent->Hilight( FALSE ); if (oldCurrent) oldCurrent->Hilight( FALSE );
RefreshLine( m_current ); RefreshLine( m_current );
RefreshLine( oldCurrent ); if (oldCurrent) RefreshLine( oldCurrent );
} }
bool on = state & wxLIST_STATE_SELECTED; bool on = state & wxLIST_STATE_SELECTED;
if (on != line->IsHilighted()) if (on != line->IsHilighted())

1
src/gtk/frame.cpp
View File

@@ -510,7 +510,6 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{ {
if ((m_x != old_x) || (m_y != old_y)) if ((m_x != old_x) || (m_y != old_y))
{ {
/* we set the size here and in gtk_frame_map_callback */
gtk_widget_set_uposition( m_widget, m_x, m_y ); gtk_widget_set_uposition( m_widget, m_x, m_y );
} }
} }

1
src/gtk1/frame.cpp
View File

@@ -510,7 +510,6 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{ {
if ((m_x != old_x) || (m_y != old_y)) if ((m_x != old_x) || (m_y != old_y))
{ {
/* we set the size here and in gtk_frame_map_callback */
gtk_widget_set_uposition( m_widget, m_x, m_y ); gtk_widget_set_uposition( m_widget, m_x, m_y );
} }
} }