Added missing const to wxGTK's wxMDIChildFrame::GetToolbar; added bc_ide.txt instruct...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/msw/bc_ide.txt b/docs/msw/bc_ide.txt
new file mode 100644 (file)
index 0000000..067d790
--- /dev/null
+++ b/docs/msw/bc_ide.txt
@@ -0,0 +1,60 @@
+Readme for wxWindows 2.0 Ide-files
+
+First release Feb. 16. 1999, detlev@reymann-online.de
+
+1. What you can do with this IDE-files
+2. Where to install the files
+3. How to modify them for your own needs
+4. How to create IDE-files for your own wxWindows-programs
+
+1. What you can do with this IDE-files
+======================================
+
+There are two IDE-files. One IDE-file should help you to create
+the wxWindows library from within the Ide of Borlands C++, v.
+5.x. The other one should help you to create most of the samples
+of wxWindows the same way.
+
+2. Where to install the files
+=============================
+
+You should copy the file named wxwin32_lib.IDE to the
+src-directory of your wxWindows-Installation (e.g. C:\wxwin\src).
+And the other file samples.IDE should be copied into the
+samples-directory (e.g. C:\wxwin\samples).
+
+3. How to modify them for your own needs
+========================================
+
+If your wxWindows-Installation resIDEs on the same drive as your
+Borland-Compiler and additionally the Borland-Installation is
+the default (e.g. C:\BC5) then there should be no need to change
+anything. Otherwise please change the path from within the IDE
+(Options->project->directories). This should be very easy for
+the library-file. For the samples-file it can be neccessary to
+change the settings for all programms seperately, because there
+are local options for each of them. To do that, show the project
+so that you can see the list with all the programs, right-click
+onto each of them and choose local options. Then change the
+directory-names.
+
+4. How to create IDE-files for your own wxWindows-programs
+==========================================================
+
+I think you are familiar with the necessary options for your own
+program. So I will only describe what is neccessary to link
+yout programm with the wxWindows-library. If you want to create
+a IDE-file for your own wxWindows-program, create a new project
+from the menu file->new->project. Deactivate all the
+standard-options, the only two things that should be activated is
+"static" for the libraries, if you want to use the library
+produced with the library-IDE and the checkbox OLE (You can
+leave this checkbox unchecked, but then you have to add the
+library \bc5\lib\ole2w32.lib to your project). You have to add
+the include-path of wxWindows to the include-path in the
+options-dialog (options->project->directories->include). The
+result should be something like:
+path_of_my_program;\bc5\include;\wxwin2\include; Then you have
+to add the libraries to the project. Open the project-view and
+activate your programm. Then right-click and choose "add" and
+select the wxWindows-library (e.g. \wxwin\lib\wx32.lib).
\ No newline at end of file

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 5ca18eee70c6644bbda6211412adc8e2aa021949..3357143d0a29756441ad94836120a37e89fe4d50 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -137,7 +137,7 @@ class wxMDIChildFrame: public wxFrame
     // no toolbar bars
   virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), 
     const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }
-  virtual wxToolBar *GetToolBar() { return (wxToolBar*)NULL; }
+  virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
   
     // no icon
   void SetIcon( const wxIcon &icon ) { m_icon = icon; }

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 5ca18eee70c6644bbda6211412adc8e2aa021949..3357143d0a29756441ad94836120a37e89fe4d50 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -137,7 +137,7 @@ class wxMDIChildFrame: public wxFrame
     // no toolbar bars
   virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), 
     const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }
-  virtual wxToolBar *GetToolBar() { return (wxToolBar*)NULL; }
+  virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
   
     // no icon
   void SetIcon( const wxIcon &icon ) { m_icon = icon; }

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 4bbe86118417d99293d138a226556574063db9f1..5646f3eb9748a4f3c5720b0e093dc7ac37f1401f 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -913,4 +913,3 @@ clean_zlib:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
-