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

Rationalised Cygwin sample makefiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-09 15:37:52 +00:00
parent a6eb3b948b
commit 8e0080ee4e
46 changed files with 474 additions and 1342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/controls/controls.cpp
View File

@@ -520,7 +520,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) )
{
#if wxUSE_CLIPBOARD
// We test for wxUSE_DRAG_AND_DROP also, because data objects
// may not be implemented for compilers that can't cope with the OLE
// parts in wxUSE_DRAG_AND_DROP.
#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP
if (!wxTheClipboard->Open())
{
*m_text << "Error opening the clipboard.\n";
@@ -563,7 +567,7 @@ void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) )
void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) )
{
#if wxUSE_CLIPBOARD
#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP
wxString text( m_multitext->GetLineText(0) );
if (text.IsEmpty())

39
samples/controls/makefile.g95
View File

@@ -1,37 +1,16 @@
#
# File: makefile.unx
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# "%W% %G%"
#
# Makefile for controls example (UNIX).
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../..
# All common UNIX compiler flags and options are now in
# this central makefile.
include $(WXDIR)/src/makeg95.env
TARGET=controls
OBJECTS = $(TARGET).o
OBJECTS = $(OBJDIR)/controls.$(OBJSUFF) $(OBJDIR)/controls_resources.$(OBJSUFF)
include $(WXDIR)/src/makeprog.g95
all: $(OBJDIR) controls$(GUISUFFIX)$(EXESUFF)
wx:
$(OBJDIR):
mkdir $(OBJDIR)
controls$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
$(CC) $(LDFLAGS) -o controls$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
$(OBJDIR)/controls.$(OBJSUFF): controls.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ controls.$(SRCSUFF)
$(OBJDIR)/controls_resources.o: controls.rc
$(RESCOMP) -i controls.rc -o $(OBJDIR)/controls_resources.o $(RESFLAGS)
clean:
rm -f $(OBJECTS) controls$(GUISUFFIX).exe core *.rsc *.res