+
+ +VC++ 5's optimization code seems to be broken and can +cause problems: this can be seen when deleting an object Dialog +Editor, in Release mode with optimizations on. If in doubt, +switch off optimisations, although this will result in much +larger executables. It seems possible that the library can be created with +strong optimization, so long as the application is not strongly +optimized. For example, in wxWindows project, set to 'Minimum +Size'. In Dialog Editor project, set to 'Customize: Favor Small +Code' (and no others). This will then work.
+
diff --git a/docs/latex/wx/document.tex b/docs/latex/wx/document.tex
index fc50326630..4affd5ade7 100644
--- a/docs/latex/wx/document.tex
+++ b/docs/latex/wx/document.tex
@@ -141,7 +141,7 @@ dialog boxes. By default, uses the frame associated with the first view.
\constfunc{wxString}{GetFilename}{\void}
-Gets the filename associated with this document, or NULL if none is
+Gets the filename associated with this document, or "" if none is
associated.
\membersection{wxDocument::GetFirstView}
@@ -241,7 +241,7 @@ document, and notifies the views that the filename (in fact, the title) has chan
\func{virtual bool}{OnOpenDocument}{\param{const wxString\& }{filename}}
-Constructs an input file stream for the given filename (which must not be NULL),
+Constructs an input file stream for the given filename (which must not be empty),
and calls LoadObject. If LoadObject returns TRUE, the document is set to
unmodified; otherwise, an error message box is displayed. The document's
views are notified that the filename has changed, to give windows an opportunity
@@ -251,7 +251,7 @@ to update their titles. All of the document's views are then updated.
\func{virtual bool}{OnSaveDocument}{\param{const wxString\& }{filename}}
-Constructs an output file stream for the given filename (which must not be NULL),
+Constructs an output file stream for the given filename (which must not be empty),
and calls SaveObject. If SaveObject returns TRUE, the document is set to
unmodified; otherwise, an error message box is displayed.
diff --git a/docs/latex/wx/tokenizr.tex b/docs/latex/wx/tokenizr.tex
index 750bd8cb35..ffc8d5dfe7 100644
--- a/docs/latex/wx/tokenizr.tex
+++ b/docs/latex/wx/tokenizr.tex
@@ -31,25 +31,25 @@ Destructor.
\membersection{wxStringTokenizer::CountTokens}\label{wxstringtokenizercounttokens}
-\constfunc{virtual int}{CountTokens}{\void}
+\constfunc{int}{CountTokens}{\void}
Returns the number of tokens in the input string.
-\membersection{wxStringTokenizer::HasMoreToken}\label{wxstringtokenizerhasmoretoken}
+\membersection{wxStringTokenizer::HasMoreTokens}\label{wxstringtokenizerhasmoretokens}
-\constfunc{virtual bool}{HasMoreToken}{\void}
+\constfunc{bool}{HasMoreTokens}{\void}
Returns TRUE if the tokenizer has further tokens.
-\membersection{wxStringTokenizer::NextToken}\label{wxstringtokenizernexttoken}
+\membersection{wxStringTokenizer::GetNextToken}\label{wxstringtokenizergetnexttoken}
-\constfunc{virtual wxString}{NextToken}{\void}
+\constfunc{wxString}{GetNextToken}{\void}
Returns the next token.
\membersection{wxStringTokenizer::GetString}\label{wxstringtokenizergetstring}
-\constfunc{virtual wxString}{GetString}{\void}
+\constfunc{wxString}{GetString}{\void}
Returns the input string.
diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 22a2375ef0..6c371edf25 100644
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -1683,11 +1683,13 @@ Sets the window's cursor.
\docparam{cursor}{Specifies the cursor that the window should normally display.}
+\begin{comment}
\wxheading{Remarks}
Under Windows, you sometimes need to call ::wxSetCursor in addition to this
function if you want the cursor to change immediately, because under Windows,
wxWindows only sets the global cursor when it detects mouse movement.
+\end{comment
\wxheading{See also}
diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 25e82c7cfc..59b5efa404 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -131,6 +131,20 @@ Troubleshooting
possible temporary workaround (comment out the final
XtDestroyWidget from ~wxWindow in window.cpp).
+- If you use flex and bison instead of yacc and lex, you may need
+ to change the relevant part of src/motif/makefile.unx to read:
+
+ ../common/y_tab.c: ../common/parser.y
+ $(YACC) ../common/parser.y
+ mv ../common/parser.tab.c ../common/y_tab.c
+
+ (the 'mv' command needs to be changed)
+
+- Some compilers, such as Sun C++, may give a lot of warnings about
+ virtual functions being hidden. Please ignore these, it's correct C++ syntax.
+ If you find any incorrect instances, though, such as a
+ missing 'const' in an overridden function, please let us know.
+
Other Notes
-----------
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 6659a1680e..98481fb68f 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -137,6 +137,13 @@ optimized. For example, in wxWindows project, set to 'Minimum
Size'. In Dialog Editor project, set to 'Customize: Favor Small
Code' (and no others). This will then work.
+Note (4): some crash problems can be due to inconsistent compiler
+options. If strange/weird/impossible things start to happen please
+check (dumping IDE project file as makefile and doing text comparison
+if necessary) that the project settings, especially the list of defined
+symbols, struct packing, etc. are exactly the same for all items in
+the project. After this, delete everything (including PCH) and recompile.
+
Visual C++ 1.5 compilation
--------------------------
diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 9326616bb9..732b4917c3 100644
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -55,7 +55,6 @@ public:
virtual bool Destroy();
- void SetClientSize(int width, int height);
void GetClientSize(int *width, int *height) const;
void GetSize(int *width, int *height) const ;
void GetPosition(int *x, int *y) const ;
diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index 26376b2c61..37cb782543 100644
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -146,7 +146,7 @@ public:
void SetTitle(const wxString& title);
void SetClientSize(int width, int height);
- void GetClientSize(int *width, int *height);
+ void GetClientSize(int *width, int *height) const;
void GetSize(int *width, int *height) const;
void GetPosition(int *x, int *y) const ;
diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h
index d8a9fbdd86..d1e2804da4 100644
--- a/include/wx/motif/setup.h
+++ b/include/wx/motif/setup.h
@@ -138,6 +138,9 @@
#define wxUSE_TOOLTIPS 0
// Use tooltips
+#define wxUSE_DYNLIB_CLASS 0
+ // Use wxLibrary
+
/*
* Finer detail
*
diff --git a/include/wx/stubs/filedlg.h b/include/wx/stubs/filedlg.h
index 9169262331..bd6075eb15 100644
--- a/include/wx/stubs/filedlg.h
+++ b/include/wx/stubs/filedlg.h
@@ -67,5 +67,23 @@ public:
#define wxHIDE_READONLY 0x0008
#define wxFILE_MUST_EXIST 0x0010
+// File selector - backward compatibility
+WXDLLEXPORT wxString wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
+ const char *default_filename = NULL, const char *default_extension = NULL,
+ const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
+ wxWindow *parent = NULL, int x = -1, int y = -1);
+
+// An extended version of wxFileSelector
+WXDLLEXPORT wxString wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
+ const char *default_filename = NULL, int *indexDefaultExtension = NULL,
+ const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
+ wxWindow *parent = NULL, int x = -1, int y = -1);
+
+// Generic file load dialog
+WXDLLEXPORT wxString wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
+
+// Generic file save dialog
+WXDLLEXPORT wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
+
#endif
// _WX_FILEDLG_H_
diff --git a/include/wx/stubs/setup.h b/include/wx/stubs/setup.h
index 0456d8c1a6..49c2fe8b50 100644
--- a/include/wx/stubs/setup.h
+++ b/include/wx/stubs/setup.h
@@ -126,6 +126,12 @@
#define wxUSE_SERIAL 0
// Use serialization
+
+#define wxUSE_TOOLTIPS 0
+ // Use tooltips
+
+#define wxUSE_DYNLIB_CLASS 0
+ // Use wxLibrary
/*
* Finer detail
*
diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h
index c23d130185..764b4c8091 100644
--- a/include/wx/tokenzr.h
+++ b/include/wx/tokenzr.h
@@ -30,7 +30,10 @@ public:
int CountTokens();
bool HasMoreToken();
+ inline bool HasMoreTokens() { return HasMoreToken(); };
wxString NextToken();
+ // A better name!
+ inline wxString GetNextToken() { return NextToken(); };
wxString GetString() { return m_string; }
void SetString(const wxString& to_tokenize,
diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index 04e328c621..23a5316143 100644
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -25,7 +25,7 @@
#endif
#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
#include "doc.h"
diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index 681fa2ebc0..6204548013 100644
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -32,7 +32,7 @@
#endif
#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
#include "wx/docview.h"
diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index e0e01bb499..61cec41421 100644
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -25,7 +25,7 @@
#endif
#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
#include "docview.h"
diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp
index 04e328c621..23a5316143 100644
--- a/samples/docvwmdi/doc.cpp
+++ b/samples/docvwmdi/doc.cpp
@@ -25,7 +25,7 @@
#endif
#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
#include "doc.h"
diff --git a/samples/docvwmdi/docview.cpp b/samples/docvwmdi/docview.cpp
index 00a2ea7340..dad7ffd133 100644
--- a/samples/docvwmdi/docview.cpp
+++ b/samples/docvwmdi/docview.cpp
@@ -30,7 +30,7 @@
#endif
#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
#include "docview.h"
diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index 56afdce5df..80adc13467 100644
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/view.cpp
@@ -25,7 +25,7 @@
#endif
#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
#include "docview.h"
diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index ab66c79b01..23209958d2 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -21,7 +21,7 @@
#endif
#if !wxUSE_CONSTRAINTS
-#error You must set wxUSE_CONSTRAINTS to 1 in wx_setup.h!
+#error You must set wxUSE_CONSTRAINTS to 1 in setup.h!
#endif
#include