These grids *must* have a border on OSX to render correctly.
This commit is contained in:
parent
f606069bf6
commit
252fad1cc7
|
@ -26,7 +26,7 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
|
||||||
wxBoxSizer* defaultTextItemsSizer;
|
wxBoxSizer* defaultTextItemsSizer;
|
||||||
defaultTextItemsSizer = new wxBoxSizer( wxVERTICAL );
|
defaultTextItemsSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_textItemsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
|
m_textItemsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_SIMPLE|wxTAB_TRAVERSAL );
|
||||||
|
|
||||||
// Grid
|
// Grid
|
||||||
m_textItemsGrid->CreateGrid( 2, 3 );
|
m_textItemsGrid->CreateGrid( 2, 3 );
|
||||||
|
@ -36,7 +36,7 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
|
||||||
m_textItemsGrid->SetMargins( 0, 0 );
|
m_textItemsGrid->SetMargins( 0, 0 );
|
||||||
|
|
||||||
// Columns
|
// Columns
|
||||||
m_textItemsGrid->SetColSize( 0, 233 );
|
m_textItemsGrid->SetColSize( 0, 255 );
|
||||||
m_textItemsGrid->SetColSize( 1, 60 );
|
m_textItemsGrid->SetColSize( 1, 60 );
|
||||||
m_textItemsGrid->SetColSize( 2, 120 );
|
m_textItemsGrid->SetColSize( 2, 120 );
|
||||||
m_textItemsGrid->EnableDragColMove( false );
|
m_textItemsGrid->EnableDragColMove( false );
|
||||||
|
@ -104,7 +104,7 @@ PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent,
|
||||||
defaultPropertiesLabel->Wrap( -1 );
|
defaultPropertiesLabel->Wrap( -1 );
|
||||||
defaultPropertiesSizer->Add( defaultPropertiesLabel, 0, wxBOTTOM|wxRIGHT, 5 );
|
defaultPropertiesSizer->Add( defaultPropertiesLabel, 0, wxBOTTOM|wxRIGHT, 5 );
|
||||||
|
|
||||||
m_graphicsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
m_graphicsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxTAB_TRAVERSAL );
|
||||||
|
|
||||||
// Grid
|
// Grid
|
||||||
m_graphicsGrid->CreateGrid( 6, 5 );
|
m_graphicsGrid->CreateGrid( 6, 5 );
|
||||||
|
|
|
@ -164,7 +164,7 @@
|
||||||
<property name="col_label_values">"Text Items" "Show" "Layer"</property>
|
<property name="col_label_values">"Text Items" "Show" "Layer"</property>
|
||||||
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
|
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
|
||||||
<property name="cols">3</property>
|
<property name="cols">3</property>
|
||||||
<property name="column_sizes">233,60,120</property>
|
<property name="column_sizes">255,60,120</property>
|
||||||
<property name="context_help"></property>
|
<property name="context_help"></property>
|
||||||
<property name="context_menu">1</property>
|
<property name="context_menu">1</property>
|
||||||
<property name="default_pane">0</property>
|
<property name="default_pane">0</property>
|
||||||
|
@ -218,7 +218,7 @@
|
||||||
<property name="tooltip"></property>
|
<property name="tooltip"></property>
|
||||||
<property name="window_extra_style"></property>
|
<property name="window_extra_style"></property>
|
||||||
<property name="window_name"></property>
|
<property name="window_name"></property>
|
||||||
<property name="window_style"></property>
|
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL</property>
|
||||||
<event name="OnSize">OnGridSize</event>
|
<event name="OnSize">OnGridSize</event>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
@ -627,7 +627,7 @@
|
||||||
<property name="tooltip">Net Class parameters</property>
|
<property name="tooltip">Net Class parameters</property>
|
||||||
<property name="window_extra_style"></property>
|
<property name="window_extra_style"></property>
|
||||||
<property name="window_name"></property>
|
<property name="window_name"></property>
|
||||||
<property name="window_style">wxTAB_TRAVERSAL</property>
|
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL</property>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
Loading…
Reference in New Issue