Merge branch 'remove-motif-and-gtk1'
Remove obsolete and unmaintained wxMotif and wxGTK1 ports. See #22877.
This commit is contained in:
commit
c2eab06e4b
652 changed files with 1126 additions and 88066 deletions
|
|
@ -13,12 +13,12 @@ installed wxWin on your system.
|
|||
Now you have to modify makefile.bcc
|
||||
(if a Windows user) or makefile.unx (if you use a real OS) setting the
|
||||
proper values for the directories. Finally, you have to run:
|
||||
make -f makefile.bcc
|
||||
for Windows (nmake if you use a MicroSoft compiler), or:
|
||||
make -f makefile.unx xview
|
||||
for Unix+xview and
|
||||
make -f makefile.unx motif
|
||||
for Unix+motif
|
||||
make -f makefile.gcc
|
||||
for Windows or
|
||||
nmake -f makefile.vc
|
||||
if you use a MicroSoft compiler, or:
|
||||
make -f makefile.unx
|
||||
for Unix.
|
||||
|
||||
If you are lucky, you will find the bombs executable, ready to be run.
|
||||
|
||||
|
|
@ -75,4 +75,4 @@ wxWindows :-)) to wxBombs.
|
|||
3) Added SetClientData to resize the window on Restart; eliminated
|
||||
scrollbars; made the frame unresizable.
|
||||
|
||||
4) Added makefile.dos for VC++ 1.x, makefile.wat for Watcom C++.
|
||||
4) Added makefile.dos for VC++ 1.x, makefile.wat for Watcom C++.
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
// resources
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXQT__)
|
||||
#if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXQT__)
|
||||
// application icon
|
||||
#include "mondrian.xpm"
|
||||
|
||||
|
|
@ -163,11 +163,6 @@ bool LifeApp::OnInit()
|
|||
// show it
|
||||
frame->Show(true);
|
||||
|
||||
// just for Motif
|
||||
#ifdef __WXMOTIF__
|
||||
frame->UpdateInfoText();
|
||||
#endif
|
||||
|
||||
// enter the main message loop and run the app
|
||||
return true;
|
||||
}
|
||||
|
|
@ -623,7 +618,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
|
|||
bmpe = wxBITMAP(east),
|
||||
bmps = wxBITMAP(south);
|
||||
|
||||
#if !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXMAC__)
|
||||
#if !defined(__WXGTK__) && !defined(__WXMAC__)
|
||||
bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY));
|
||||
bmpw.SetMask(new wxMask(bmpw, *wxLIGHT_GREY));
|
||||
bmpc.SetMask(new wxMask(bmpc, *wxLIGHT_GREY));
|
||||
|
|
@ -1093,8 +1088,8 @@ void LifeCanvas::OnScroll(wxScrollWinEvent& event)
|
|||
m_thumbY = m_viewportH;
|
||||
}
|
||||
|
||||
#if defined(__WXGTK__) || defined(__WXMOTIF__)
|
||||
// wxGTK and wxMotif update the thumb automatically (wxMSW doesn't);
|
||||
#if defined(__WXGTK__)
|
||||
// wxGTK updates the thumb automatically (wxMSW doesn't);
|
||||
// so reset it back as we always want it to be in the same position.
|
||||
if (type != wxEVT_SCROLLWIN_THUMBTRACK)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ wxPoem was converted to use the wxWindows toolkit, from the original
|
|||
WinPoem which received a favourable review from Windows Shareware 500.
|
||||
|
||||
Since it now uses wxWindows, wxPoem may be compiled on a variety
|
||||
of platforms such as X (XView or Motif), Windows and NT.
|
||||
of platforms.
|
||||
|
||||
Files
|
||||
-----
|
||||
|
|
@ -49,9 +49,7 @@ Installation
|
|||
UNIX
|
||||
====
|
||||
|
||||
wxPoem comes in Open Look and Motif versions for the Sun, and a
|
||||
Linux Open Look version. For other platforms, you will need to
|
||||
recompile the source.
|
||||
You will need to compile wxPoem from the source.
|
||||
|
||||
|
||||
Use
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue