Doc mods; fixed return non-processing problem; fixed toolbar sizing problems
(incl. MDI area clipping); put wxPrintPaperDatabase, wxPrintPaperType into prntbase.cpp since it's needed in non-PostScript WIN16 for the generic page setup dialog; corrected some 16-bit makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -95,7 +95,9 @@ public:
|
||||
void OnSetFont( wxCommandEvent &event );
|
||||
void OnPageChanged( wxNotebookEvent &event );
|
||||
void OnSliderUpdate( wxCommandEvent &event );
|
||||
#ifndef __WIN16__
|
||||
void OnSpinUpdate( wxSpinEvent &event );
|
||||
#endif
|
||||
void OnPasteFromClipboard( wxCommandEvent &event );
|
||||
void OnCopyToClipboard( wxCommandEvent &event );
|
||||
void OnMoveToEndOfText( wxCommandEvent &event );
|
||||
@@ -108,7 +110,9 @@ public:
|
||||
wxGauge *m_gauge;
|
||||
wxSlider *m_slider;
|
||||
wxButton *m_fontButton;
|
||||
#ifndef __WIN16__
|
||||
wxSpinButton *m_spinbutton;
|
||||
#endif
|
||||
wxTextCtrl *m_spintext;
|
||||
MyTextCtrl *m_multitext;
|
||||
MyTextCtrl *m_textentry;
|
||||
@@ -336,7 +340,9 @@ EVT_BUTTON (ID_RADIOBOX_FONT, MyPanel::OnRadioButtons)
|
||||
EVT_CHECKBOX (ID_RADIOBOX_ENABLE, MyPanel::OnRadioButtons)
|
||||
EVT_BUTTON (ID_SET_FONT, MyPanel::OnSetFont)
|
||||
EVT_SLIDER (ID_SLIDER, MyPanel::OnSliderUpdate)
|
||||
#ifndef __WIN16__
|
||||
EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate)
|
||||
#endif
|
||||
EVT_BUTTON (ID_PASTE_TEXT, MyPanel::OnPasteFromClipboard)
|
||||
EVT_BUTTON (ID_COPY_TEXT, MyPanel::OnCopyToClipboard)
|
||||
EVT_BUTTON (ID_MOVE_END_ZONE, MyPanel::OnMoveToEndOfText)
|
||||
@@ -541,8 +547,10 @@ m_text(NULL), m_notebook(NULL)
|
||||
);
|
||||
#endif
|
||||
m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
|
||||
#ifndef __WIN16__
|
||||
m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );
|
||||
m_spinbutton->SetRange(0,100);
|
||||
#endif
|
||||
m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
|
||||
}
|
||||
|
||||
@@ -873,12 +881,14 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
|
||||
m_gauge->SetValue( m_slider->GetValue() );
|
||||
}
|
||||
|
||||
#ifndef __WIN16__
|
||||
void MyPanel::OnSpinUpdate( wxSpinEvent &event )
|
||||
{
|
||||
wxString value;
|
||||
value.sprintf( "%d", (int)event.GetPosition() );
|
||||
m_spintext->SetValue( value );
|
||||
}
|
||||
#endif
|
||||
|
||||
MyPanel::~MyPanel()
|
||||
{
|
||||
|
||||
@@ -1,88 +1,17 @@
|
||||
#
|
||||
# File: makefile.dos
|
||||
# Author: Julian Smart
|
||||
# Created: 1993
|
||||
# Created: 1998
|
||||
# Updated:
|
||||
# Copyright: (c) 1993, AIAI, University of Edinburgh
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds printing example (DOS).
|
||||
# Makefile : Builds 16-bit sample, VC++ 1.5
|
||||
# Use FINAL=1 argument to nmake to build final version with no debugging
|
||||
# info.
|
||||
# info
|
||||
|
||||
# Set WXDIR for your system
|
||||
WXDIR = $(WXWIN)
|
||||
|
||||
!include $(WXDIR)\src\makemsc.env
|
||||
|
||||
THISDIR = $(WXDIR)\samples\printing
|
||||
WXLIB = $(WXDIR)\lib\wx.lib
|
||||
LIBS=$(WXLIB) oldnames libw llibcew commdlg ddeml shell mmsystem
|
||||
INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
|
||||
DUMMY=$(WXDIR)\src\msw\dummy.obj
|
||||
|
||||
# Set this to nothing if using MS C++ 7
|
||||
ZOPTION=/Z7
|
||||
|
||||
!ifndef FINAL
|
||||
FINAL=0
|
||||
!endif
|
||||
|
||||
DEBUGFLAG=#/DDEBUG=1
|
||||
|
||||
!if "$(FINAL)" == "0"
|
||||
CPPFLAGS=/AL /W3 /Zi $(ZOPTION) /G2sw /Od $(INC) $(DEBUGFLAG) /YuWX_PREC.H /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch
|
||||
LINKFLAGS=/NOD /NOE /CO /ONERROR:NOEXE /SEG:256
|
||||
!else
|
||||
CPPFLAGS=/AL /W3 /G2sw $(INC) /Ox /YuWX_PREC.H /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch
|
||||
LINKFLAGS=/NOD /ONERROR:NOEXE /SEG:256
|
||||
!endif
|
||||
|
||||
HEADERS = printing.h
|
||||
SOURCES = printing.$(SRCSUFF)
|
||||
OBJECTS = printing.obj
|
||||
|
||||
printing: printing.exe
|
||||
|
||||
all: wx printing.exe
|
||||
|
||||
wx:
|
||||
cd $(WXDIR)\src\msw
|
||||
nmake -f makefile.dos FINAL=$(FINAL)
|
||||
cd $(THISDIR)
|
||||
|
||||
wxclean:
|
||||
cd $(WXDIR)\src\msw
|
||||
nmake -f makefile.dos clean
|
||||
cd $(THISDIR)
|
||||
|
||||
|
||||
printing.exe: $(DUMMY) $(WXLIB) printing.obj printing.def printing.res
|
||||
link $(LINKFLAGS) @<<
|
||||
$(DUMMY) printing.obj,
|
||||
printing,
|
||||
NUL,
|
||||
$(LIBS),
|
||||
printing.def
|
||||
;
|
||||
<<
|
||||
rc -31 -K printing.res
|
||||
|
||||
printing.obj: printing.h printing.$(SRCSUFF) $(DUMMY) $(WXDIR)\include\base\wx_print.h
|
||||
cl @<<
|
||||
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
|
||||
<<
|
||||
|
||||
printing.res : printing.rc $(WXDIR)\include\msw\wx.rc
|
||||
rc -r /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa printing
|
||||
|
||||
clean:
|
||||
-erase *.obj
|
||||
-erase *.exe
|
||||
-erase *.res
|
||||
-erase *.map
|
||||
-erase *.sbr
|
||||
-erase *.pdb
|
||||
TARGET=printing
|
||||
OBJECTS=$(TARGET).obj
|
||||
|
||||
!include $(WXDIR)\src\makeprog.msc
|
||||
|
||||
|
||||
@@ -1,86 +1,17 @@
|
||||
#
|
||||
# File: makefile.dos
|
||||
# Author: Julian Smart
|
||||
# Created: 1993
|
||||
# Created: 1998
|
||||
# Updated:
|
||||
# Copyright: (c) 1993, AIAI, University of Edinburgh
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds resource example (DOS).
|
||||
# Makefile : Builds 16-bit sample, VC++ 1.5
|
||||
# Use FINAL=1 argument to nmake to build final version with no debugging
|
||||
# info.
|
||||
# info
|
||||
|
||||
# Set WXDIR for your system
|
||||
WXDIR = $(WXWIN)
|
||||
|
||||
!include $(WXDIR)\src\makemsc.env
|
||||
TARGET=resource
|
||||
OBJECTS=$(TARGET).obj
|
||||
|
||||
THISDIR = $(WXDIR)\samples\resource
|
||||
WXLIB = $(WXDIR)\lib\wx.lib
|
||||
LIBS=$(WXLIB) oldnames libw llibcew commdlg ddeml shell mmsystem
|
||||
INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
|
||||
DUMMY=$(WXDIR)\src\msw\dummy.obj
|
||||
!include $(WXDIR)\src\makeprog.msc
|
||||
|
||||
# Set this to nothing if using MS C++ 7
|
||||
ZOPTION=/Z7
|
||||
|
||||
!ifndef FINAL
|
||||
FINAL=0
|
||||
!endif
|
||||
|
||||
PRECOMP = /YuWX_PREC.H /Fp$(WXDIR)\src\msw\wx.pch
|
||||
|
||||
!if "$(FINAL)" == "0"
|
||||
CPPFLAGS=/AL /W3 /Zi $(ZOPTION) /G2sw /Od $(INC) $(PRECOMP) /Dwx_msw
|
||||
LINKFLAGS=/NOD /CO /ONERROR:NOEXE /SEG:256
|
||||
!else
|
||||
CPPFLAGS=/AL /W3 /G2sw $(INC) /Ox $(PRECOMP) /Dwx_msw
|
||||
LINKFLAGS=/NOD /ONERROR:NOEXE /SEG:256
|
||||
!endif
|
||||
|
||||
HEADERS = resource.h
|
||||
SOURCES = resource.$(SRCSUFF)
|
||||
OBJECTS = resource.obj
|
||||
|
||||
resource: resource.exe
|
||||
|
||||
all: wx resource.exe
|
||||
|
||||
wx:
|
||||
cd $(WXDIR)\src\msw
|
||||
nmake -f makefile.dos FINAL=$(FINAL)
|
||||
cd $(THISDIR)
|
||||
|
||||
wxclean:
|
||||
cd $(WXDIR)\src\msw
|
||||
nmake -f makefile.dos clean
|
||||
cd $(THISDIR)
|
||||
|
||||
|
||||
resource.exe: $(DUMMY) $(WXLIB) resource.obj resource.def resource.res
|
||||
link $(LINKFLAGS) @<<
|
||||
$(DUMMY) resource.obj,
|
||||
resource,
|
||||
NUL,
|
||||
$(LIBS),
|
||||
resource.def
|
||||
;
|
||||
<<
|
||||
rc -31 -K resource.res
|
||||
|
||||
resource.obj: resource.h resource.$(SRCSUFF) dialog1.wxr $(DUMMY)
|
||||
cl @<<
|
||||
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
|
||||
<<
|
||||
|
||||
resource.res : resource.rc $(WXDIR)\include\msw\wx.rc
|
||||
rc -r /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa resource
|
||||
|
||||
clean:
|
||||
-erase *.obj
|
||||
-erase *.exe
|
||||
-erase *.res
|
||||
-erase *.map
|
||||
-erase *.sbr
|
||||
-erase *.pdb
|
||||
|
||||
@@ -70,7 +70,7 @@ bool MyApp::OnInit(void)
|
||||
frame->SetMenuBar(menuBar);
|
||||
|
||||
// Create the toolbar
|
||||
frame->CreateToolBar(wxNO_BORDER|wxHORIZONTAL|wxTB_FLAT|wxTB_DOCKABLE, ID_TOOLBAR);
|
||||
frame->CreateToolBar(wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT|wxTB_DOCKABLE, ID_TOOLBAR);
|
||||
|
||||
frame->GetToolBar()->SetMargins( 2, 2 );
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
* Last change: JS 13 Mar 97 5:02 pm
|
||||
NAME Events
|
||||
DESCRIPTION 'Event tester'
|
||||
EXETYPE WINDOWS
|
||||
|
||||
Reference in New Issue
Block a user