From b69f1bd1862481d4c10ca2c67e871ff5642ae2ee Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 1 Mar 1999 22:41:38 +0000 Subject: [PATCH] Cured some Motif bugs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tardist | 73 +++++++++--------- docs/changes.txt | 1 + docs/html/index.htm | 134 +++++++++++++++++++++++++++------ docs/html/logo.gif | Bin 3490 -> 4656 bytes docs/latex/porting/porting.tex | 2 +- docs/readme.txt | 28 +++---- src/generic/sashwin.cpp | 4 + src/generic/splitter.cpp | 4 + src/motif.inc | 1 + src/motif/checklst.cpp | 4 +- src/motif/mdi.cpp | 2 +- 11 files changed, 174 insertions(+), 79 deletions(-) diff --git a/distrib/msw/tardist b/distrib/msw/tardist index faf359bce6..44062e55a7 100644 --- a/distrib/msw/tardist +++ b/distrib/msw/tardist @@ -24,66 +24,67 @@ cd $1 echo Removing backup files... rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~ -rm -f $2/wxgtk.tar.gz -rm -f $2/wxmotif.tar.gz -rm -f $2/wxdocsrc.tar.gz -rm -f $2/wxhtml.tar.gz -rm -f $2/wxpdf.tar.gz -rm -f $2/wxstubs.tar.gz -rm -f $2/tex2rtf.tar.gz -rm -f $2/ogl.tar.gz -rm -f $2/wxtree.tar.gz +rm -f $2/wx200*.tgz +rm -f $2/tex2rtf2.tgz +rm -f $2/ogl3.tgz +rm -f $2/treedraw.tar.gz rm -f $2/glcanvas.tar.gz echo Tarring... +### Generic +ls `cat $1/distrib/msw/generic.rsp` > /tmp/wxgen.txt +tar cvf $2/wx200gen.tar -T /tmp/wxgen.txt +gzip $2/wx200gen.tar +mv $2/wx200gen.tar.gz $2/wx200gen.tgz + ### wxGTK ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp` > /tmp/wxgtk.txt -tar cvf $2/wxgtk.tar -T /tmp/wxgtk.txt -gzip $2/wxgtk.tar -mv $2/wxgtk.tar.gz $2/wxgtk.tgz +tar cvf $2/wx200gtk.tar -T /tmp/wxgtk.txt +gzip $2/wx200gtk.tar +mv $2/wx200gtk.tar.gz $2/wx200gtk.tgz ### wxMotif ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp` > /tmp/wxmotif.txt -tar cvf $2/wxmotif.tar -T /tmp/wxmotif.txt -gzip $2/wxmotif.tar -mv $2/wxmotif.tar.gz $2/wxmotif.tgz +tar cvf $2/wx200mot.tar -T /tmp/wxmotif.txt +gzip $2/wx200mot.tar +mv $2/wx200mot.tar.gz $2/wx200mot.tgz ### Doc sources ls `cat $1/distrib/msw/docsrc.rsp` > /tmp/docsrc.txt -tar cvf $2/wxdocsrc.tar -T /tmp/docsrc.txt -gzip $2/wxdocsrc.tar -mv $2/wxdocsrc.tar.gz $2/wxdocsrc.tgz +tar cvf $2/wx200doc.tar -T /tmp/docsrc.txt +gzip $2/wx200doc.tar +mv $2/wx200doc.tar.gz $2/wx200doc.tgz ### HTML docs ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt -tar cvf $2/wxhtml.tar -T /tmp/html.txt -gzip $2/wxhtml.tar -mv $2/wxhtml.tar.gz $2/wxhtml.tgz +tar cvf $2/wx200htm.tar -T /tmp/html.txt +gzip $2/wx200htm.tar +mv $2/wx200htm.tar.gz $2/wx200htm.tgz ### PDF docs ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt -tar cvf $2/wxpdf.tar -T /tmp/pdf.txt -gzip $2/wxpdf.tar -mv $2/wxpdf.tar.gz $2/wxpdf.tgz +tar cvf $2/wx200pdf.tar -T /tmp/pdf.txt +gzip $2/wx200pdf.tar +mv $2/wx200pdf.tar.gz $2/wx200pdf.tgz ### Stubs files ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt -tar cvf $2/wxstubs.tar -T /tmp/stubs.txt -gzip $2/wxstubs.tar -mv $2/wxstubs.tar.gz $2/wxstubs.tgz +tar cvf $2/wx200stubs.tar -T /tmp/stubs.txt +gzip $2/wx200stubs.tar +mv $2/wx200stubs.tar.gz $2/wx200stubs.tgz ### Tex2RTF ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt -tar cvf $2/tex2rtf.tar -T /tmp/tex2rtf.txt -gzip $2/tex2rtf.tar -mv $2/tex2rtf.tar.gz $2/tex2rtf.tgz +tar cvf $2/tex2rtf2.tar -T /tmp/tex2rtf.txt +gzip $2/tex2rtf2.tar +mv $2/tex2rtf2.tar.gz $2/tex2rtf2.tgz ### OGL ls `cat $1/distrib/msw/ogl.rsp` > /tmp/ogl.txt -tar cvf $2/ogl.tar -T /tmp/ogl.txt -gzip $2/ogl.tar -mv $2/ogl.tar.gz $2/ogl.tgz +tar cvf $2/ogl3.tar -T /tmp/ogl.txt +gzip $2/ogl3.tar +mv $2/ogl3.tar.gz $2/ogl3.tgz ### wxGLCanvas ls `cat $1/distrib/msw/glcanvas.rsp` > /tmp/glcanvas.txt @@ -93,8 +94,8 @@ mv $2/glcanvas.tar.gz $2/glcanvas.tgz ### wxTreeLayout ls `cat $1/distrib/msw/wxtree.rsp` > /tmp/wxtree.txt -tar cvf $2/wxtree.tar -T /tmp/wxtree.txt -gzip $2/wxtree.tar -mv $2/wxtree.tar.gz $2/wxtree.tgz +tar cvf $2/treedraw.tar -T /tmp/wxtree.txt +gzip $2/treedraw.tar +mv $2/treedraw.tar.gz $2/treedraw.tgz echo Done! diff --git a/docs/changes.txt b/docs/changes.txt index 25287c316a..4361ed5d79 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -13,6 +13,7 @@ wxMSW: - Fixed problems with in dialogs/panels. - Fixed window cursor setting. +- Fixed toolbar sizing and edge-clipping problems. - Some makefile fixes. wxMotif: diff --git a/docs/html/index.htm b/docs/html/index.htm index be88c494e3..00d0d0afd5 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -5,7 +5,8 @@ - + + @@ -24,9 +25,9 @@

-Welcome to wxWindows 2, the premiere cross-platform GUI C++ framework. This is an index of -the plain text and HTML documentation. Documentation is also available in Acrobat (PDF) and Windows Help, -from the wxWindows Web site.

+Welcome to wxWindows 2, the première cross-platform GUI C++ framework. This is an index of +the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've +downloaded from the wxWindows Web site.

@@ -37,9 +38,7 @@ from the wxWindows Web site.

-
- -

Installation and release notes

+

Installation and release notes

-
+

wxWindows manuals

+ + + + + + + -

wxWindows manuals

+ + - + -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -

Third-party tools

+ + + + + + + + + + + + + +
+HTML + +WinHelp + +PDF +
+Reference Manual + +Reference Manual + +Reference Manual +
+Porting Guide + +Porting Guide + +Porting Guide +
+Dialog Editor Manual + +Dialog Editor Manual + +Dialog Editor Manual +
+Property List Classes + +Propert List Classes + +Property List Classes +
+wxTreeLayout Class + +wxTreeLayout Class + +wxTreeLayout Class +
+Remstar ODBC Classes + +

+		 +Remstar ODBC Classes +
+ + +

Third-party tools

-
- -

Samples

+

Samples

  • bombs: minesweeper-like game. diff --git a/docs/html/logo.gif b/docs/html/logo.gif index 62b41f0f10ff3a7a534eef3dde6ecb99bbcd2fe4..2242fffd965a2779c29b9599d4e14bf2bebe4005 100644 GIT binary patch literal 4656 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. Good luck! -The wxWindows Team, February 1999 +The wxWindows Team, March 1st, 1999 diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp index 46a3e5f7eb..b0b0c19a6d 100644 --- a/src/generic/sashwin.cpp +++ b/src/generic/sashwin.cpp @@ -111,7 +111,11 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event) wxSashEdgePosition sashHit = SashHitTest(x, y); // reset the cursor +#ifdef __WXMOTIF__ + SetCursor(* wxSTANDARD_CURSOR); +#else SetCursor(wxCursor()); +#endif if (event.LeftDown()) { diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 44243d300b..f5e8b79855 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -146,7 +146,11 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) event.Position(&x, &y); // reset the cursor +#ifdef __WXMOTIF__ + SetCursor(* wxSTANDARD_CURSOR); +#else SetCursor(wxCursor()); +#endif if (event.LeftDown()) { diff --git a/src/motif.inc b/src/motif.inc index 169888d98c..1fb0422186 100644 --- a/src/motif.inc +++ b/src/motif.inc @@ -75,6 +75,7 @@ LIB_CPP_SRC=\ motif/brush.cpp \ motif/button.cpp \ motif/checkbox.cpp \ + motif/checklst.cpp \ motif/choice.cpp \ motif/clipbrd.cpp \ motif/colour.cpp \ diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp index f880ecaf45..bbd6915e8e 100644 --- a/src/motif/checklst.cpp +++ b/src/motif/checklst.cpp @@ -60,13 +60,13 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, // check items // ----------- -bool wxCheckListBox::IsChecked(uint uiIndex) const +bool wxCheckListBox::IsChecked(size_t uiIndex) const { // TODO return FALSE; } -void wxCheckListBox::Check(uint uiIndex, bool bCheck) +void wxCheckListBox::Check(size_t uiIndex, bool bCheck) { // TODO } diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp index 1cad5adba2..bace16b9f9 100644 --- a/src/motif/mdi.cpp +++ b/src/motif/mdi.cpp @@ -133,7 +133,7 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event) void wxMDIParentFrame::GetClientSize(int *width, int *height) const { - wxWindow::GetClientSize(width, height); + wxFrame::GetClientSize(width, height); } void wxMDIParentFrame::OnActivate(wxActivateEvent& event) -- 2.50.0