From: David Webster <Dave.Webster@bhmi.com>
Date: Tue, 15 May 2001 19:53:48 +0000 (+0000)
Subject: Enable this sample for OS/2
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/aa06a8fdfbc9f4b5af3af38125ec8703742a70ee?ds=sidebyside;hp=e661fcd7704429e7712d2475a6677255e7d40751

Enable this sample for OS/2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/scroll/makefile.va b/samples/scroll/makefile.va
new file mode 100644
index 0000000000..4a05a83f97
--- /dev/null
+++ b/samples/scroll/makefile.va
@@ -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
+
diff --git a/samples/scroll/mondros2.ico b/samples/scroll/mondros2.ico
new file mode 100644
index 0000000000..8b0e58c0d7
Binary files /dev/null and b/samples/scroll/mondros2.ico differ
diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index b190de4637..71d7b0e83c 100644
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -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",
@@ -125,15 +127,15 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         "wonderful",
         "examples."
     };
-  
+
     m_button = new wxButton( this, ID_QUERYPOS, "Query position", wxPoint(10,110) );
-  
+
     (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,150), wxSize(80,-1) );
-  
+
     (void) new wxRadioButton( this, -1, "Disable", wxPoint(10,190) );
-  
+
     (void) new wxComboBox( this, -1, "This", wxPoint(10,230), wxDefaultSize, 5, choices );
-  
+
     (void) new wxRadioBox( this, -1, "This", wxPoint(10,310), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_COLS );
 
     (void) new wxRadioBox( this, -1, "This", wxPoint(10,440), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_ROWS );
@@ -155,24 +157,31 @@ 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 );
     test->SetBackgroundColour( "WHEAT" );
     test->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
-  
+
     test = new wxPanel( this, -1, wxPoint(310, 530), wxSize(130,120), wxRAISED_BORDER | wxTAB_TRAVERSAL );
     test->SetBackgroundColour( "WHEAT" );
     test->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
 
-    SetBackgroundColour( "WHEAT" );
-  
+#endif
+
+    SetBackgroundColour( "BLUE" );
+
     SetCursor( wxCursor( wxCURSOR_IBEAM ) );
 }
 
@@ -202,7 +211,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     dc.DrawText( "Press mouse button to test calculations!", 160, 50 );
 
     dc.DrawText( "Some text", 140, 140 );
-  
+
     dc.DrawRectangle( 100, 160, 200, 200 );
 }
 
@@ -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 );