More SC++ fixes; HelpGen starting to compile with VC++; image sample now compiles...

[wxWidgets.git] / samples / mdi / mdi.cpp

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index aaa465707d115118ef7672585baa2a2764f17afa..d47b5f2ac196c4a02f72b04d103710deed182ae9 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -23,7 +23,7 @@
 
 #include <wx/toolbar.h>
 
 
 #include <wx/toolbar.h>
 

-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)

 #include "mondrian.xpm"
 #include "bitmaps/new.xpm"
 #include "bitmaps/open.xpm"
 #include "mondrian.xpm"
 #include "bitmaps/new.xpm"
 #include "bitmaps/open.xpm"


@@ -38,7 +38,7 @@
 
 #include "mdi.h"
 
 
 #include "mdi.h"
 

-MyFrame *frame = NULL;
+MyFrame *frame = (MyFrame *) NULL;

 wxList my_children;
 
 IMPLEMENT_APP(MyApp)
 wxList my_children;
 
 IMPLEMENT_APP(MyApp)


@@ -54,12 +54,14 @@ bool MyApp::OnInit(void)
 {
   // Create the main frame window
 
 {
   // Create the main frame window
 

-  frame = new MyFrame(NULL, -1, "MDI Demo", wxPoint(0, 0), wxSize(500, 400),
-   wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL);
+  frame = new MyFrame((wxFrame *) NULL, -1, (char *) "MDI Demo", wxPoint(-1, -1), wxSize(500, 400),
+   wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);

 
 

-  // Give it an icon (this is ignored in MDI mode: uses resources)
+  // Give it an icon

 #ifdef __WXMSW__
   frame->SetIcon(wxIcon("mdi_icn"));
 #ifdef __WXMSW__
   frame->SetIcon(wxIcon("mdi_icn"));

+#else
+  frame->SetIcon(wxIcon( mondrian_xpm ));

 #endif
 
   // Make a menubar
 #endif
 
   // Make a menubar


@@ -107,7 +109,6 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
     CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
     InitToolBar(GetToolBar());
 
     CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
     InitToolBar(GetToolBar());
 

-#ifdef __WXMSW__

     // Accelerators
     wxAcceleratorEntry entries[3];
     entries[0].Set(wxACCEL_CTRL, (int) 'N', MDI_NEW_WINDOW);
     // Accelerators
     wxAcceleratorEntry entries[3];
     entries[0].Set(wxACCEL_CTRL, (int) 'N', MDI_NEW_WINDOW);


@@ -115,7 +116,6 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
     entries[2].Set(wxACCEL_CTRL, (int) 'A', MDI_ABOUT);
     wxAcceleratorTable accel(3, entries);
     SetAcceleratorTable(accel);
     entries[2].Set(wxACCEL_CTRL, (int) 'A', MDI_ABOUT);
     wxAcceleratorTable accel(3, entries);
     SetAcceleratorTable(accel);

-#endif

 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )


@@ -139,16 +139,13 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
       subframe->SetTitle(title);
       winNumber ++;
 
       subframe->SetTitle(title);
       winNumber ++;
 

-      // Give it an icon (this is ignored in MDI mode: uses resources)
+      // Give it an icon

 #ifdef __WXMSW__
       subframe->SetIcon(wxIcon("chrt_icn"));
 #else
 #ifdef __WXMSW__
       subframe->SetIcon(wxIcon("chrt_icn"));
 #else

-      subframe->SetIcon(wxIcon(mondrian_xpm));
+      subframe->SetIcon(wxIcon( mondrian_xpm ));

 #endif
 
 #endif
 

-      // Give it a status line
-      subframe->CreateStatusBar();
-

       // Make a menubar
       wxMenu *file_menu = new wxMenu;
 
       // Make a menubar
       wxMenu *file_menu = new wxMenu;
 


@@ -191,8 +188,9 @@ END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):

- wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)
+ wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)

 {
 {

+    SetBackgroundColour(wxColour("WHITE"));

 }
 
 // Define the repainting behaviour
 }
 
 // Define the repainting behaviour


@@ -277,7 +275,7 @@ MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint&
 const long style):
   wxMDIChildFrame(parent, -1, title, pos, size, style)
 {
 const long style):
   wxMDIChildFrame(parent, -1, title, pos, size, style)
 {

-  canvas = NULL;
+  canvas = (MyCanvas *) NULL;

   my_children.Append(this);
 }
 
   my_children.Append(this);
 }
 


@@ -333,24 +331,24 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
 #endif
   int currentX = 5;
 
 #endif
   int currentX = 5;
 

-  toolBar->AddTool(0, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, NULL, "New file");
+  toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file");

   currentX += width + 5;
   currentX += width + 5;

-  toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, NULL, "Open file");
+  toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file");

   currentX += width + 5;
   currentX += width + 5;

-  toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, NULL, "Save file");
+  toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Save file");

   currentX += width + 5;
   toolBar->AddSeparator();
   currentX += width + 5;
   toolBar->AddSeparator();

-  toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, NULL, "Copy");
+  toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Copy");

   currentX += width + 5;
   currentX += width + 5;

-  toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, NULL, "Cut");
+  toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Cut");

   currentX += width + 5;
   currentX += width + 5;

-  toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, NULL, "Paste");
+  toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Paste");

   currentX += width + 5;
   toolBar->AddSeparator();
   currentX += width + 5;
   toolBar->AddSeparator();

-  toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, NULL, "Print");
+  toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Print");

   currentX += width + 5;
   toolBar->AddSeparator();
   currentX += width + 5;
   toolBar->AddSeparator();

-  toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, NULL, "Help");
+  toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help");

 
   toolBar->Realize();
 
 
   toolBar->Realize();