changed make_int, make_exp .. to wxmake_int..
fixed small listbox thing fixed layout probs of wxFrame small DnD updates small DialogEd optical correction small ODBC updates added wxListBox DClick Text in controls sample updated wxGTK.spec git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -542,7 +542,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
|
||||
}
|
||||
}
|
||||
|
||||
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
|
||||
m_sizeSet = FALSE;
|
||||
}
|
||||
|
||||
wxMenuBar *wxFrame::GetMenuBar() const
|
||||
@@ -560,7 +560,7 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
|
||||
|
||||
GetChildren().DeleteObject( m_frameToolBar );
|
||||
|
||||
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
|
||||
m_sizeSet = FALSE;
|
||||
|
||||
return m_frameToolBar;
|
||||
}
|
||||
@@ -583,7 +583,7 @@ wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, co
|
||||
|
||||
m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
|
||||
|
||||
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
|
||||
m_sizeSet = FALSE;
|
||||
|
||||
return m_frameStatusBar;
|
||||
}
|
||||
|
@@ -72,8 +72,25 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
|
||||
{
|
||||
wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
|
||||
event.SetEventObject( listbox );
|
||||
event.SetInt( sel );
|
||||
|
||||
wxArrayInt aSelections;
|
||||
int count = listbox->GetSelections(aSelections);
|
||||
if ( count > 0 )
|
||||
{
|
||||
event.m_commandInt = aSelections[0] ;
|
||||
event.m_clientData = listbox->GetClientData( event.m_commandInt );
|
||||
wxString str(listbox->GetString(event.m_commandInt));
|
||||
if (str != "") event.m_commandString = copystring((char *)(const char *)str);
|
||||
}
|
||||
else
|
||||
{
|
||||
event.m_commandInt = -1 ;
|
||||
event.m_commandString = copystring("") ;
|
||||
}
|
||||
|
||||
listbox->GetEventHandler()->ProcessEvent( event );
|
||||
|
||||
if (event.m_commandString) delete[] event.m_commandString ;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
|
@@ -1231,6 +1231,11 @@ static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
|
||||
gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
|
||||
child->m_width,
|
||||
child->m_height );
|
||||
|
||||
if (wxIS_KIND_OF(parent,wxFrame))
|
||||
{
|
||||
parent->m_sizeSet = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user