Changeset 2460

Timestamp:

Jul 23, 2007, 12:56:51 AM (15 years ago)

Author:

charles

Message:

cleaner sizer code in the main window

File:

• trunk/wx/xmission.cc (modified) (2 diffs)

trunk/wx/xmission.cc

@@ -560 +560 @@
 
     wxSplitterWindow * hsplit = new wxSplitterWindow( this );
+    hsplit->SetSashGravity( 0.8 );
 
     wxPanel * row1 = new wxPanel( hsplit, wxID_ANY );
-    wxFlexGridSizer * row_sizer = new wxFlexGridSizer( 2, 0, 5 );
-    row_sizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
-    row_sizer->SetFlexibleDirection( wxHORIZONTAL );
-    row1->SetSizer( row_sizer );
-
-    /**
-    ***  Filters
-    **/
+
+    /* Filters */
 
     wxListCtrl * filters = new wxListCtrl( row1, wxID_ANY, wxDefaultPosition, wxDefaultSize,
@@ -580 +575 @@
     filters->InsertItem( i++, _T("Active (1)") );
     filters->InsertItem( i++, _T("Inactive") );
-    row_sizer->Add( filters, wxSizerFlags().Expand() );
-
-    /**
-    ***  Torrent List
-    **/
+
+    /* Torrent List */
 
     myTorrentList = new wxListCtrl( row1, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                     wxLC_REPORT|wxLC_SINGLE_SEL );
     rebuildTorrentList();
-    row_sizer->Add( myTorrentList, wxSizerFlags().Expand() );
-    row_sizer->AddGrowableCol( 1, 1 );
+
+    wxBoxSizer * boxSizer = new wxBoxSizer( wxHORIZONTAL );
+    boxSizer->Add( filters, 0, wxEXPAND|wxRIGHT, 5 );
+    boxSizer->Add( myTorrentList, 1, wxEXPAND, 0 );
+    row1->SetSizer( boxSizer );
 
 
     wxNotebook * notebook = new wxNotebook( hsplit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP );
-
     wxButton * tmp = new wxButton( notebook, wxID_ANY, _T("Hello World"));
     notebook->AddPage( tmp, _T("General"), false );