Add <contrib-lib> bakefile tag. Like <wx-lib> except that in VC++ '.dsw' files

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

diff --git a/contrib/samples/ogl/studio/view.cpp b/contrib/samples/ogl/studio/view.cpp
index 5a157a8704d6fefccc167a45ec832786e2358e5b..5e4d579c1eaa6308eebc497969887f6ba6742ad6 100644 (file)
--- a/contrib/samples/ogl/studio/view.cpp
+++ b/contrib/samples/ogl/studio/view.cpp
@@ -309,8 +309,6 @@ void csDiagramView::OnCopyUpdate(wxUpdateUIEvent& event)
 
 void csDiagramView::OnPasteUpdate(wxUpdateUIEvent& event)
 {
 
 void csDiagramView::OnPasteUpdate(wxUpdateUIEvent& event)
 {

-    /* csDiagramDocument *doc = */ (csDiagramDocument *)GetDocument();
-

     int n = wxGetApp().GetDiagramClipboard().GetCount();
 
     event.Enable( (n > 0) );
     int n = wxGetApp().GetDiagramClipboard().GetCount();
 
     event.Enable( (n > 0) );


@@ -877,6 +875,9 @@ void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
 
     if (palette->GetSelection() == PALETTE_TEXT_TOOL)
     {
 
     if (palette->GetSelection() == PALETTE_TEXT_TOOL)
     {

+        wxString newLabel;
+
+#if wxUSE_WX_RESOURCES

         // Ask for a label and create a new free-floating text region
         csLabelEditingDialog* dialog = new csLabelEditingDialog(GetParent());
 
         // Ask for a label and create a new free-floating text region
         csLabelEditingDialog* dialog = new csLabelEditingDialog(GetParent());
 


@@ -888,8 +889,9 @@ void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
             return;
         }
 
             return;
         }
 

-        wxString newLabel = dialog->GetShapeLabel();
+        newLabel = dialog->GetShapeLabel();

         dialog->Destroy();
         dialog->Destroy();

+#endif // wxUSE_WX_RESOURCES

 
         wxShape* shape = new csTextBoxShape;
         shape->AssignNewIds();
 
         wxShape* shape = new csTextBoxShape;
         shape->AssignNewIds();