Ran make -f build/autogen.mk

[wxWidgets.git] / contrib / samples / ogl / studio / dialogs.cpp

diff --git a/contrib/samples/ogl/studio/dialogs.cpp b/contrib/samples/ogl/studio/dialogs.cpp
index 5445c1bc51b379f0a353a2483d10763898b7778f..b19ebd5402d11aff121c3a74b7bf56c5f63c3fde 100644 (file)
--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ b/contrib/samples/ogl/studio/dialogs.cpp
@@ -9,10 +9,6 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// #pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,14 +20,14 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

-#include <wx/deprecated/setup.h>
-#include <wx/deprecated/resource.h>

 #include "dialogs.h"
 #include "doc.h"
 #include "view.h"
 #include "studio.h"
 #include "studio_resources.h"
 
 #include "dialogs.h"
 #include "doc.h"
 #include "view.h"
 #include "studio.h"
 #include "studio_resources.h"
 

+#if wxUSE_WX_RESOURCES
+

 IMPLEMENT_CLASS(csLabelEditingDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(csLabelEditingDialog, wxDialog)
 IMPLEMENT_CLASS(csLabelEditingDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(csLabelEditingDialog, wxDialog)


@@ -101,7 +97,7 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent):
     m_generalSettings = new wxPanel;
 
     #ifdef  __WXDEBUG__
     m_generalSettings = new wxPanel;
 
     #ifdef  __WXDEBUG__

-    bool success = 
+    bool success =

     #endif
                    wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog"));
     wxASSERT_MSG( (success), _T("Could not load general settings panel."));
     #endif
                    wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog"));
     wxASSERT_MSG( (success), _T("Could not load general settings panel."));


@@ -110,7 +106,7 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent):
     m_diagramSettings = new wxPanel;
 
     #ifdef  __WXDEBUG__
     m_diagramSettings = new wxPanel;
 
     #ifdef  __WXDEBUG__

-    success = 
+    success =

     #endif
               wxLoadFromResource(m_diagramSettings, m_notebook, _T("diagram_settings_dialog"));
     wxASSERT_MSG( (success), _T("Could not load diagram settings panel."));
     #endif
               wxLoadFromResource(m_diagramSettings, m_notebook, _T("diagram_settings_dialog"));
     wxASSERT_MSG( (success), _T("Could not load diagram settings panel."));


@@ -205,7 +201,7 @@ bool csSettingsDialog::TransferDataFromWindow()
     }
 
     // Apply settings to all open diagram documents
     }
 
     // Apply settings to all open diagram documents

-    wxNode* node = wxGetApp().GetDocManager()->GetDocuments().GetFirst();
+    wxObjectList::compatibility_iterator node = wxGetApp().GetDocManager()->GetDocuments().GetFirst();

     while (node)
     {
         wxDocument* doc = (wxDocument*) node->GetData();
     while (node)
     {
         wxDocument* doc = (wxDocument*) node->GetData();


@@ -257,7 +253,7 @@ END_EVENT_TABLE()
 // For 400x400 settings dialog, size your panels to about 375x325 in dialog editor
 
 csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title,
 // For 400x400 settings dialog, size your panels to about 375x325 in dialog editor
 
 csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title,

-  wxPanel* attributeDialog, const wxString& attributeDialogName):
+    wxPanel* attributeDialog, const wxString& attributeDialogName):

     wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
 {
     m_attributeDialog = attributeDialog;
     wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
 {
     m_attributeDialog = attributeDialog;


@@ -269,7 +265,7 @@ csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxStrin
 
     m_generalPropertiesDialog = new csGeneralShapePropertiesDialog;
     #ifdef  __WXDEBUG__
 
     m_generalPropertiesDialog = new csGeneralShapePropertiesDialog;
     #ifdef  __WXDEBUG__

-    bool success = 
+    bool success =

     #endif
                    wxLoadFromResource(m_generalPropertiesDialog, m_notebook, _T("general_shape_properties_dialog"));
     wxASSERT_MSG( (success), _T("Could not load general properties panel."));
     #endif
                    wxLoadFromResource(m_generalPropertiesDialog, m_notebook, _T("general_shape_properties_dialog"));
     wxASSERT_MSG( (success), _T("Could not load general properties panel."));


@@ -365,7 +361,7 @@ void csShapePropertiesDialog::SetDefaults()
     if (!m_attributeDialog)
         return;
 
     if (!m_attributeDialog)
         return;
 

-    wxWindowListNode* node = m_attributeDialog->GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = m_attributeDialog->GetChildren().GetFirst();

     while (node)
     {
         wxWindow* child = (wxWindow*) node->GetData();
     while (node)
     {
         wxWindow* child = (wxWindow*) node->GetData();


@@ -416,6 +412,8 @@ void csGeneralShapePropertiesDialog::SetShapeLabel(const wxString& label)
     textCtrl->SetValue(label);
 }
 
     textCtrl->SetValue(label);
 }
 

+#endif // wxUSE_WX_RESOURCES
+

 /*
  * csThinRectangleDialog
  */
 /*
  * csThinRectangleDialog
  */