Enable this sample for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e661fcd770
commit
aa06a8fdfb
44
samples/scroll/makefile.va
Normal file
44
samples/scroll/makefile.va
Normal file
@ -0,0 +1,44 @@
|
||||
#
|
||||
# File: makefile.va
|
||||
# Author: David Webster
|
||||
# Created: 1999
|
||||
# Updated:
|
||||
# Copyright: (c) David Webster
|
||||
#
|
||||
# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM)
|
||||
# Use FINAL=1 argument to nmake to build final version with no debug info.
|
||||
|
||||
# Set WXDIR for your system
|
||||
WXDIR=$(WXWIN)
|
||||
|
||||
!include $(WXDIR)\src\makeva.env
|
||||
|
||||
#
|
||||
# Define which program this is and what it's path is and where to output to
|
||||
#
|
||||
PROGRAM=scroll
|
||||
THISDIR=$(WXWIN)\samples\$(PROGRAM)
|
||||
OPATH=$(THISDIR)\$D
|
||||
|
||||
#
|
||||
# Make sure output directory is available
|
||||
#
|
||||
!if [md $(OPATH)]
|
||||
!endif
|
||||
|
||||
#
|
||||
# Standard definitions
|
||||
#
|
||||
PROGRC=$(THISDIR)\$(PROGRAM).rcO
|
||||
OBJECTS=$(OPATH)\$(PROGRAM).obj
|
||||
PROGRES=$(OPATH)\$(PROGRAM).res
|
||||
PROGTARGET=$(OPATH)\$(PROGRAM).exe
|
||||
|
||||
.cpp{$OPATH}.obj:
|
||||
@echo $<
|
||||
icc @<<
|
||||
$(CPPFLAGS) /Fo$@ /Tp $<
|
||||
<<
|
||||
|
||||
!include $(WXDIR)\src\makeprog.va
|
||||
|
BIN
samples/scroll/mondros2.ico
Normal file
BIN
samples/scroll/mondros2.ico
Normal file
Binary file not shown.
@ -117,6 +117,8 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
|
||||
(void) new wxButton( this, ID_MOVEBUTTON, "move button", wxPoint(150,10) );
|
||||
(void) new wxButton( this, ID_SCROLLWIN, "scroll win", wxPoint(250,10) );
|
||||
|
||||
#if 0
|
||||
|
||||
wxString choices[] =
|
||||
{
|
||||
"This",
|
||||
@ -155,8 +157,13 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
|
||||
|
||||
(void) new wxListBox( this, -1, wxPoint(260,280), wxSize(120,120), 5, choices, wxLB_ALWAYS_SB );
|
||||
|
||||
wxPanel *test = new wxPanel( this, -1, wxPoint(10, 530), wxSize(130,120), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
|
||||
#endif
|
||||
|
||||
wxPanel *test = new wxPanel( this, -1, wxPoint(10, 10), wxSize(130,50), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
|
||||
test->SetBackgroundColour( "WHEAT" );
|
||||
|
||||
#if 0
|
||||
|
||||
wxButton *test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
|
||||
|
||||
test = new wxPanel( this, -1, wxPoint(160, 530), wxSize(130,120), wxSUNKEN_BORDER | wxTAB_TRAVERSAL );
|
||||
@ -171,7 +178,9 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
|
||||
test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
|
||||
test2->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
|
||||
|
||||
SetBackgroundColour( "WHEAT" );
|
||||
#endif
|
||||
|
||||
SetBackgroundColour( "BLUE" );
|
||||
|
||||
SetCursor( wxCursor( wxCURSOR_IBEAM ) );
|
||||
}
|
||||
@ -297,15 +306,15 @@ MyFrame::MyFrame()
|
||||
|
||||
m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(100,100) );
|
||||
m_canvas->SetScrollbars( 10, 10, 50, 100 );
|
||||
|
||||
#if 0
|
||||
m_log = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
|
||||
wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
|
||||
delete old_log;
|
||||
|
||||
#endif
|
||||
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
topsizer->Add( m_canvas, 1, wxEXPAND );
|
||||
topsizer->Add( m_log, 0, wxEXPAND );
|
||||
// topsizer->Add( m_log, 0, wxEXPAND );
|
||||
|
||||
SetAutoLayout( TRUE );
|
||||
SetSizer( topsizer );
|
||||
|
Loading…
Reference in New Issue
Block a user