X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1484b5cc701329c54bbe70f2a155119fd86945c7..b02a6dc2b6e10302272af502a12b249681df40d6:/contrib/samples/ogl/studio/dialogs.cpp diff --git a/contrib/samples/ogl/studio/dialogs.cpp b/contrib/samples/ogl/studio/dialogs.cpp index 6136b5863d..5445c1bc51 100644 --- a/contrib/samples/ogl/studio/dialogs.cpp +++ b/contrib/samples/ogl/studio/dialogs.cpp @@ -90,7 +90,7 @@ END_EVENT_TABLE() // For 400x400 settings dialog, size your panels to about 375x325 in dialog editor csSettingsDialog::csSettingsDialog(wxWindow* parent): - wxDialog(parent, -1, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT)) + wxDialog(parent, wxID_ANY, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT)) { m_generalSettings = NULL; m_diagramSettings = NULL; @@ -100,13 +100,19 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent): m_generalSettings = new wxPanel; - bool success = wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog")); + #ifdef __WXDEBUG__ + bool success = + #endif + wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog")); wxASSERT_MSG( (success), _T("Could not load general settings panel.")); - m_notebook->AddPage(m_generalSettings, _T("General"), TRUE); + m_notebook->AddPage(m_generalSettings, _T("General"), true); m_diagramSettings = new wxPanel; - success = wxLoadFromResource(m_diagramSettings, m_notebook, _T("diagram_settings_dialog")); + #ifdef __WXDEBUG__ + success = + #endif + wxLoadFromResource(m_diagramSettings, m_notebook, _T("diagram_settings_dialog")); wxASSERT_MSG( (success), _T("Could not load diagram settings panel.")); m_notebook->AddPage(m_diagramSettings, _T("Diagram")); @@ -175,7 +181,7 @@ bool csSettingsDialog::TransferDataToWindow() str.Printf(_T("%d"), wxGetApp().GetGridSpacing()); gridSpacing->SetValue(str); - return TRUE; + return true; } bool csSettingsDialog::TransferDataFromWindow() @@ -195,14 +201,14 @@ bool csSettingsDialog::TransferDataFromWindow() if (wxGetApp().GetGridStyle() == csGRID_STYLE_DOTTED) { wxMessageBox(_T("Dotted grid style not yet implemented."), _T("Studio"), wxICON_EXCLAMATION); - return FALSE; + return false; } // Apply settings to all open diagram documents - wxNode* node = wxGetApp().GetDocManager()->GetDocuments().First(); + wxNode* node = wxGetApp().GetDocManager()->GetDocuments().GetFirst(); while (node) { - wxDocument* doc = (wxDocument*) node->Data(); + wxDocument* doc = (wxDocument*) node->GetData(); if (doc->IsKindOf(CLASSINFO(csDiagramDocument))) { csDiagramDocument* diagramDoc = (csDiagramDocument*) doc; @@ -213,12 +219,12 @@ bool csSettingsDialog::TransferDataFromWindow() { case csGRID_STYLE_NONE: { - diagram->SetSnapToGrid(FALSE); + diagram->SetSnapToGrid(false); break; } case csGRID_STYLE_INVISIBLE: { - diagram->SetSnapToGrid(TRUE); + diagram->SetSnapToGrid(true); break; } case csGRID_STYLE_DOTTED: @@ -228,10 +234,10 @@ bool csSettingsDialog::TransferDataFromWindow() } } } - node = node->Next(); + node = node->GetNext(); } - return TRUE; + return true; } /* @@ -252,7 +258,7 @@ END_EVENT_TABLE() csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title, wxPanel* attributeDialog, const wxString& attributeDialogName): - wxDialog(parent, -1, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT)) + wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT)) { m_attributeDialog = attributeDialog; m_alternativeAttributeDialog = NULL; @@ -262,12 +268,14 @@ csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxStrin wxPoint(2, 2), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH - 4, SHAPE_PROPERTY_DIALOG_HEIGHT - 4)); m_generalPropertiesDialog = new csGeneralShapePropertiesDialog; - bool success = wxLoadFromResource(m_generalPropertiesDialog, m_notebook, _T("general_shape_properties_dialog")); + #ifdef __WXDEBUG__ + bool success = + #endif + wxLoadFromResource(m_generalPropertiesDialog, m_notebook, _T("general_shape_properties_dialog")); wxASSERT_MSG( (success), _T("Could not load general properties panel.")); m_notebook->AddPage(m_generalPropertiesDialog, _T("General")); - success = wxLoadFromResource(m_attributeDialog, m_notebook, attributeDialogName); - if (!success) + if (!wxLoadFromResource(m_attributeDialog, m_notebook, attributeDialogName)) { wxMessageBox(_T("Could not load the attribute dialog for this shape."), _T("Studio"), wxICON_EXCLAMATION); delete m_attributeDialog; @@ -282,8 +290,7 @@ csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxStrin wxString str(attributeDialogName); str += _T("1"); m_alternativeAttributeDialog = new wxPanel; - success = wxLoadFromResource(m_alternativeAttributeDialog, m_notebook, str); - if (success) + if (wxLoadFromResource(m_alternativeAttributeDialog, m_notebook, str)) { m_notebook->AddPage(m_alternativeAttributeDialog, _T("Attributes (alternative)")); } @@ -358,31 +365,31 @@ void csShapePropertiesDialog::SetDefaults() if (!m_attributeDialog) return; - wxNode* node = m_attributeDialog->GetChildren().First(); + wxWindowListNode* node = m_attributeDialog->GetChildren().GetFirst(); while (node) { - wxWindow* child = (wxWindow*) node->Data(); + wxWindow* child = (wxWindow*) node->GetData(); if (child->IsKindOf(CLASSINFO(wxChoice))) { wxChoice* choice = (wxChoice*) child; choice->SetSelection(0); } - node = node->Next(); + node = node->GetNext(); } if (!m_alternativeAttributeDialog) return; - node = m_alternativeAttributeDialog->GetChildren().First(); + node = m_alternativeAttributeDialog->GetChildren().GetFirst(); while (node) { - wxWindow* child = (wxWindow*) node->Data(); + wxWindow* child = (wxWindow*) node->GetData(); if (child->IsKindOf(CLASSINFO(wxChoice))) { wxChoice* choice = (wxChoice*) child; choice->SetSelection(0); } - node = node->Next(); + node = node->GetNext(); } }