Fixes for wxHashTable when wxUSE_STL=1:

[wxWidgets.git] / samples / docvwmdi / view.h

diff --git a/samples/docvwmdi/view.h b/samples/docvwmdi/view.h
index f44634985626e2d1372066ada3fd88b9280f11b5..46ce8a24662f92ec3e0b34af27427c390ed1503e 100644 (file)
--- a/samples/docvwmdi/view.h
+++ b/samples/docvwmdi/view.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -23,7 +23,7 @@ class MyCanvas: public wxScrolledWindow
 public:
     wxView *view;
     
 public:
     wxView *view;
     

-    MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
+    MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);

     virtual void OnDraw(wxDC& dc);
     void OnMouseEvent(wxMouseEvent& event);
 
     virtual void OnDraw(wxDC& dc);
     void OnMouseEvent(wxMouseEvent& event);
 


@@ -36,16 +36,16 @@ class MyTextWindow: public wxTextCtrl
 public:
     wxView *view;
     
 public:
     wxView *view;
     

-    MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
+    MyTextWindow(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);

 };
 
 class DrawingView: public wxView
 {
 public:
 };
 
 class DrawingView: public wxView
 {
 public:

-    wxFrame *frame;
+    wxMDIChildFrame *frame;

     MyCanvas *canvas;
   
     MyCanvas *canvas;
   

-    DrawingView() { canvas = (MyCanvas *) NULL; frame = (wxFrame *) NULL; }
+    DrawingView() { canvas = (MyCanvas *) NULL; frame = (wxMDIChildFrame *) NULL; }

     ~DrawingView() {}
 
     bool OnCreate(wxDocument *doc, long flags);
     ~DrawingView() {}
 
     bool OnCreate(wxDocument *doc, long flags);


@@ -63,10 +63,10 @@ private:
 class TextEditView: public wxView
 {
 public:
 class TextEditView: public wxView
 {
 public:

-    wxFrame *frame;
+    wxMDIChildFrame *frame;

     MyTextWindow *textsw;
   
     MyTextWindow *textsw;
   

-    TextEditView(): wxView() { frame = (wxFrame *) NULL; textsw = (MyTextWindow *) NULL; }
+    TextEditView(): wxView() { frame = (wxMDIChildFrame *) NULL; textsw = (MyTextWindow *) NULL; }

     ~TextEditView() {}
 
     bool OnCreate(wxDocument *doc, long flags);
     ~TextEditView() {}
 
     bool OnCreate(wxDocument *doc, long flags);