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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
samples/widgets/makefile.unx Normal file
View File

@@ -0,0 +1,43 @@
#
# File: Makefile for the widgets sample
# Author: Vadim Zeitlin
# Copyright: (c) 2002 wxWindows team
#
# This makefile requires a Unix version of wxWindows
# to be installed on your system. This is most often
# done typing "make install" when using the complete
# sources of wxWindows or by installing the two
# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
# under Linux.
#
CXX = $(shell wx-config --cxx)
PROGRAM = widgets
OBJECTS = $(PROGRAM).o \
button.o \
combobox.o \
gauge.o \
listbox.o \
notebook.o \
radiobox.o \
slider.o \
spinbtn.o \
static.o \
textctrl.o
# implementation
.SUFFIXES: .o .cpp
.cpp.o :
$(CXX) -c `wx-config --cxxflags` -o $@ $<
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
clean:
rm -f *.o $(PROGRAM)

19
samples/widgets/notebook.cpp
View File

@@ -380,18 +380,17 @@ void NotebookWidgetsPage::CreateNotebook()
if ( notebook )
{
int sel = notebook->GetSelection();
const int sel = notebook->GetSelection();
int count = notebook->GetPageCount();
const int count = notebook->GetPageCount();
// recreate the pages
for ( int n = 0; n < count; n++ )
{
wxNotebookPage *page = notebook->GetPage(0);
page->Reparent(m_notebook);
m_notebook->AddPage(page, notebook->GetPageText(0), FALSE,
notebook->GetPageImage(0));
notebook->RemovePage(0);
m_notebook->AddPage(CreateNewPage(),
notebook->GetPageText(n),
FALSE,
notebook->GetPageImage(n));
}
m_sizerNotebook->Remove(notebook);
@@ -543,4 +542,4 @@ void NotebookWidgetsPage::OnPageChanged(wxNotebookEvent& event)
event.Skip();
}
#endif
#endif

6
samples/widgets/slider.cpp
View File

@@ -459,10 +459,8 @@ void SliderWidgetsPage::OnUpdateUIOtherSide(wxUpdateUIEvent& event)
void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
{
long value = event.GetInt();
wxASSERT_MSG( value == m_slider->GetValue(),
wxT("slider value should be the same") );
wxASSERT_MSG( event.GetInt() == m_slider->GetValue(),
wxT("slider value should be the same") );
wxEventType eventType = event.GetEventType();

4
samples/widgets/widgets.dsp
View File

@@ -55,7 +55,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw233.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "widgets - Win32 Debug DLL"
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw233d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ELSEIF "$(CFG)" == "widgets - Win32 Release"

4
samples/widgets/widgets.h
View File

@@ -17,7 +17,7 @@ class WXDLLEXPORT wxNotebook;
class WXDLLEXPORT wxSizer;
class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT WidgetsPageInfo;
class WidgetsPageInfo;
#include "wx/panel.h"
@@ -68,7 +68,7 @@ public:
// dynamic WidgetsPage creation helpers
// ----------------------------------------------------------------------------
class WXDLLEXPORT WidgetsPageInfo
class WidgetsPageInfo
{
public:
typedef WidgetsPage *(*Constructor)(wxNotebook *notebook,