From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Wed, 28 Jul 2004 09:36:45 +0000 (+0000)
Subject: Score dialog improvements.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b6d0f0c7a5aa57c9340e847135a6e3d6d9ccd7d4

Score dialog improvements.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/demos/forty/scoredg.cpp b/demos/forty/scoredg.cpp
index 8c02afc433..79fc942fa8 100644
--- a/demos/forty/scoredg.cpp
+++ b/demos/forty/scoredg.cpp
@@ -28,7 +28,9 @@
 #include "scorefil.h"
 #include "scoredg.h"
 
-#define USE_GRID_FOR_SCORE 0
+// adjust USE_GRID_FOR_SCORE with O or 1 to your preferences
+// by default it takes wxGrid component for score display if available in target port
+#define USE_GRID_FOR_SCORE     wxUSE_GRID
 
 #if USE_GRID_FOR_SCORE
 #include "wx/grid.h"
@@ -177,14 +179,21 @@ ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) :
     list->EnableDragRowSize(false);
     list->EnableDragColSize(false);
     list->EnableDragGridSize(false);
+    list->ClearSelection();
+    list->EnableEditing(false);
+    sz.x = wxDefaultCoord;
 #else
     ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile, wxDefaultPosition, sz);
 #endif
 
+    list->SetBestFittingSize(sz);
+
     // locate and resize with sizers
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     topsizer->Add( list, 1, wxALL|wxGROW, 10 );
-    topsizer->Add( new wxButton(this, wxID_OK, _("OK")), 0, wxALIGN_CENTER_HORIZONTAL|wxALL , 10 );
+    wxButton *button = new wxButton(this, wxID_OK, _("OK"));
+    topsizer->Add( button, 0, wxALIGN_CENTER_HORIZONTAL|wxALL , 10 );
+    button->SetFocus();
 
     SetSizer( topsizer );
 
@@ -200,7 +209,7 @@ ScoreDialog::~ScoreDialog()
 
 void ScoreDialog::Display()
 {
-    Show(true);
+    ShowModal();
 }
 
 void ScoreDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))