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

Added more compat. functions for wxGrid so grid sample compiles;

Browse Source 
fixed regtest compilation prob. (but still crashes on exit); fixed
tab sample compile problem.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-10-25 14:28:43 +00:00
parent 09fb22cf3c
commit 60a67569bf
7 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/makefile.vc
View File

@@ -26,7 +26,7 @@ NOMAKE=1
# Misc. compilation errors
COMPIL=1
# Need PNG
PNGSETUP=1
PNGSETUP=
!include $(WXDIR)\src\makemsc.env
@@ -44,10 +44,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\controls
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\db
nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\dde
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\dialogs
@@ -68,6 +66,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\grid
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\newgrid
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\help
nmake -f makefile.vc FINAL=$(FINAL)
@@ -114,10 +114,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\proplist
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\regtest
nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\resource
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
@@ -130,12 +128,10 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\splitter
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\tab
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\taskbar
nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\text
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\thread
@@ -144,22 +140,16 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\treectrl
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\typetest
nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\validate
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\wizard
nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\wxpoem
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\wxsocket
nmake -f makefile.vc FINAL=$(FINAL)
!endif
clean:
cd $(WXDIR)\samples\bombs
@@ -194,6 +184,8 @@ clean:
nmake -f makefile.vc clean
cd $(WXDIR)\samples\grid
nmake -f makefile.vc clean
cd $(WXDIR)\samples\newgrid
nmake -f makefile.vc clean
cd $(WXDIR)\samples\help
nmake -f makefile.vc clean
cd $(WXDIR)\samples\html

2
samples/regtest/regtest.cpp
View File

@@ -529,7 +529,7 @@ void RegTreeCtrl::OnChar(wxKeyEvent& event)
if ( event.KeyCode() == WXK_DELETE )
DeleteSelected();
else
wxTreeCtrl::OnChar(event);
event.Skip();
}
void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)

4
samples/tab/test.cpp
View File

@@ -240,7 +240,7 @@ void MyFrame::OnSize(wxSizeEvent& event)
m_view->SetViewRect(rect);
m_view->Layout();
m_view->LayoutTabs();
// Need to do it a 2nd time to get the tab height with
// the new view width
@@ -252,7 +252,7 @@ void MyFrame::OnSize(wxSizeEvent& event)
m_view->SetViewRect(rect);
m_view->Layout();
m_view->LayoutTabs();
// Move all the panels to the new view position and size
wxNode* node = m_view->GetWindows().First();