Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some .tex tweaks; pngdemo fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-12 18:28:34 +00:00
parent f6fcbb63d0
commit 6be663cf0d
13 changed files with 104 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
samples/makefile.g95
View File

@@ -11,66 +11,68 @@
# info
# Set WXDIR for your system
SHELL=cmd.exe
WXDIR = ..
THISDIR=$(WXDIR)/samples
all:
cd $(WXDIR)/samples/bombs; make -f makefile.g95
cd $(WXDIR)/samples/fractal; make -f makefile.g95
cd $(WXDIR)/samples/splitter; make -f makefile.g95
cd $(WXDIR)/samples/resource; make -f makefile.g95
cd $(WXDIR)/samples/controls; make -f makefile.g95
cd $(WXDIR)/samples/listctrl; make -f makefile.g95
cd $(WXDIR)/samples/treectrl; make -f makefile.g95
cd $(WXDIR)/samples/validate; make -f makefile.g95
cd $(WXDIR)/samples/mdi; make -f makefile.g95
cd $(WXDIR)/samples/minimal; make -f makefile.g95
cd $(WXDIR)/samples/layout; make -f makefile.g95
cd $(WXDIR)/samples/printing; make -f makefile.g95
cd $(WXDIR)/samples/proplist; make -f makefile.g95
cd $(WXDIR)/samples/toolbar; make -f makefile.g95
cd $(WXDIR)/samples/dialogs; make -f makefile.g95
cd $(WXDIR)/samples/docview; make -f makefile.g95
cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95
cd $(WXDIR)/samples/sashtest; make -f makefile.g95
cd $(WXDIR)/samples/controls; make -f makefile.g95
cd $(WXDIR)/samples/nativdlg; make -f makefile.g95
cd $(WXDIR)/samples/grid; make -f makefile.g95
cd $(WXDIR)/samples/internat; make -f makefile.g95
cd $(WXDIR)/samples/checklst; make -f makefile.g95
cd $(WXDIR)/samples/dnd; make -f makefile.g95
cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95
cd $(WXDIR)/samples/joytest; make -f makefile.g95
cd $(WXDIR)/samples/memcheck; make -f makefile.g95
# cd $(WXDIR)/samples/regtest; make -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/bombs -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/fractal -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/splitter -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/resource -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/listctrl -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/treectrl -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/validate -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/mdi -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/minimal -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/layout -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/printing -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/proplist -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/toolbar -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/dialogs -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/docview -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/docvwmdi -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/sashtest -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/nativdlg -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/grid -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/internat -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/checklst -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/dnd -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/ownerdrw -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/joytest -f makefile.g95
$(MAKE) -C $(WXDIR)/samples/memcheck -f makefile.g95
# $(MAKE) -C $(WXDIR)/samples/regtest -f makefile.g95
clean:
cd $(WXDIR)/samples/bombs; make -f makefile.g95 clean
cd $(WXDIR)/samples/fractal; make -f makefile.g95 clean
cd $(WXDIR)/samples/splitter; make -f makefile.g95 clean
cd $(WXDIR)/samples/mdi; make -f makefile.g95 clean
cd $(WXDIR)/samples/minimal; make -f makefile.g95 clean
cd $(WXDIR)/samples/layout; make -f makefile.g95 clean
cd $(WXDIR)/samples/printing; make -f makefile.g95 clean
cd $(WXDIR)/samples/proplist; make -f makefile.g95 clean
cd $(WXDIR)/samples/toolbar; make -f makefile.g95 clean
cd $(WXDIR)/samples/dialogs; make -f makefile.g95 clean
cd $(WXDIR)/samples/resource; make -f makefile.g95 clean
cd $(WXDIR)/samples/listctrl; make -f makefile.g95 clean
cd $(WXDIR)/samples/treectrl; make -f makefile.g95 clean
cd $(WXDIR)/samples/validate; make -f makefile.g95 clean
cd $(WXDIR)/samples/docview; make -f makefile.g95 clean
cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95 clean
cd $(WXDIR)/samples/sashtest; make -f makefile.g95 clean
cd $(WXDIR)/samples/controls; make -f makefile.g95 clean
cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 clean
cd $(WXDIR)/samples/grid; make -f makefile.g95 clean
cd $(WXDIR)/samples/internat; make -f makefile.g95 clean
cd $(WXDIR)/samples/checklst; make -f makefile.g95 clean
cd $(WXDIR)/samples/dnd; make -f makefile.g95 clean
cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95 clean
cd $(WXDIR)/samples/regtest; make -f makefile.g95 clean
cd $(WXDIR)/samples/joytest; make -f makefile.g95 clean
cd $(WXDIR)/samples/memcheck; make -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/bombs -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/fractal -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/splitter -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/mdi -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/minimal -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/layout -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/printing -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/proplist -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/toolbar -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/dialogs -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/resource -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/listctrl -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/treectrl -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/validate -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/docview -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/docvwmdi -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/sashtest -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/nativdlg -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/grid -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/internat -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/checklst -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/dnd -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/ownerdrw -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/regtest -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/joytest -f makefile.g95 clean
$(MAKE) -C $(WXDIR)/samples/memcheck -f makefile.g95 clean

6
samples/png/pngdemo.cpp
View File

@@ -178,10 +178,10 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
if ( g_TestBitmap && g_TestBitmap->Ok() )
{
wxMemoryDC memDC;
if ( g_TestBitmap->GetColourMap() )
if ( g_TestBitmap->GetPalette() )
{
memDC.SetPalette(* g_TestBitmap->GetColourMap());
dc.SetPalette(* g_TestBitmap->GetColourMap());
memDC.SetPalette(* g_TestBitmap->GetPalette());
dc.SetPalette(* g_TestBitmap->GetPalette());
}
memDC.SelectObject(* g_TestBitmap);