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

Some doc corrections (added blank lines at end of docs); corrected Forty sample

Browse Source 
dialog behaviour; added dummy menubar constructors; corrected wxMSW wxRegion bug


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-12 08:22:29 +00:00
parent b98d804b28
commit cba2db0c29
29 changed files with 201 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/forty/canvas.cpp
View File

@@ -51,7 +51,6 @@ FortyCanvas::FortyCanvas(wxWindow* parent, int x, int y, int w, int h) :
m_font = wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);
#endif
SetBackgroundColour(FortyApp::BackgroundColour());
AllowDoubleClick(TRUE);
m_handCursor = new wxCursor(wxCURSOR_HAND);
m_arrowCursor = new wxCursor(wxCURSOR_ARROW);
@@ -98,7 +97,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
// then ask the player for their name
if (m_player.Length() == 0 && !m_playerDialog)
{
m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
m_playerDialog = new PlayerSelectionDialog(this, m_scoreFile);
m_playerDialog->ShowModal();
m_player = m_playerDialog->GetPlayersName();
if (m_player.Length() > 0)
@@ -108,7 +107,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
m_scoreFile->ReadPlayersScore(m_player, wins, games, score);
m_game->NewPlayer(wins, games, score);
m_game->DisplayScore(dc);
delete m_playerDialog;
m_playerDialog->Destroy();
m_playerDialog = 0;
Refresh();
}

2
samples/forty/card.cpp
View File

@@ -41,7 +41,7 @@
#include "forty.h"
#include "card.h"
#ifdef __WXGTK__
#if defined(__WXGTK__) || defined(__WXMOTIF__)
#include "pictures.xpm"
#include "symbols.xbm"
#endif

4
samples/forty/forty.cpp
View File

@@ -91,7 +91,7 @@ bool FortyApp::OnInit()
-1, -1, 668, 510
);
// Show the frame
// Show the frame
frame->Show(TRUE);
return TRUE;
@@ -192,7 +192,7 @@ FortyFrame::~FortyFrame()
void FortyFrame::OnCloseWindow(wxCloseEvent& event)
{
if (m_canvas->OnCloseCanvas())
if (m_canvas->OnCloseCanvas() )
{
this->Destroy();
}

6
samples/forty/playerdg.cpp
View File

@@ -172,17 +172,17 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
else
{
m_player = name;
Show(FALSE);
EndModal(wxID_OK);
}
}
else
{
wxMessageBox("Please enter your name", "Forty Thieves");
wxMessageBox("Please enter your name", "Forty Thieves");
}
}
else
{
m_player = "";
Show(FALSE);
EndModal(wxID_CANCEL);
}
}

138
samples/makefile.b32
View File

@@ -8,7 +8,7 @@
# "%W% %G%"
#
# Makefile : Builds samples for Win95, BC++ WIN32
# Use FINAL=1 argument to nmake to build final version with no debugging
# Use FINAL=1 argument to make to build final version with no debugging
# info
# Set WXDIR for your system
@@ -16,146 +16,144 @@ WXDIR = $(WXWIN)
THISDIR=$(WXDIR)\samples
!include $(WXDIR)\src\makevc.env
all:
cd $(WXDIR)\samples\splitter
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\resource
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\controls
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\listctrl
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\treectrl
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\validate
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\mdi
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\minimal
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\layout
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\printing
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\toolbar
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\dialogs
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\docview
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\docvwmdi
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\controls
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\nativdlg
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\grid
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\internat
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\dnd
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\joytest
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\taskbar
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\sashtest
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
!if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck
!endif
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\ownerdrw
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\checklst
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\minifram
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\bombs
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\fractal
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\wxpoem
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\typetest
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\proplist
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\image
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\dde
nmake -f makefile.b32 FINAL=$(FINAL)
make -f makefile.b32 FINAL=$(FINAL)
# cd $(WXDIR)\samples\regtest
# nmake -f makefile.b32 FINAL=$(FINAL)
# make -f makefile.b32 FINAL=$(FINAL)
clean:
cd $(WXDIR)\samples\splitter
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\mdi
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\minimal
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\layout
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\printing
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\toolbar
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\dialogs
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\resource
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\listctrl
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\treectrl
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\validate
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\docview
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\docvwmdi
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\controls
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\nativdlg
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\grid
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\internat
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\checklst
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\ownerdrw
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\dnd
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\joytest
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\regtest
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\taskbar
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\sashtest
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\memcheck
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\minifram
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\bombs
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\fractal
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\wxpoem
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\typetest
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\proplist
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\image
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples\dde
nmake -f makefile.b32 clean
make -f makefile.b32 clean
cd $(WXDIR)\samples