Author: matt
Date: 2010-04-01 08:56:17 -0700 (Thu, 01 Apr 2010)
New Revision: 7392
Log:
Ported Fl_Return_Button.
Added:
branches/branch-3.0/fltk3/ReturnButton.h
branches/branch-3.0/test/buttons1.cxx
branches/branch-3.0/test/buttons2.cxx
Modified:
branches/branch-3.0/FL/Fl_Button.H
branches/branch-3.0/FL/Fl_Return_Button.H
branches/branch-3.0/fltk/Button.h
branches/branch-3.0/fltk/ReturnButton.h
branches/branch-3.0/fltk/Widget.h
branches/branch-3.0/fltk3/Fl_Color_Chooser.H
branches/branch-3.0/fltk3/Fl_File_Chooser.H
branches/branch-3.0/fltk3/Fl_Return_Button.H
branches/branch-3.0/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
branches/branch-3.0/ide/Xcode3/plists/buttons-Info.plist
branches/branch-3.0/src/Fl_Color_Chooser.cxx
branches/branch-3.0/src/Fl_File_Chooser.cxx
branches/branch-3.0/src/Fl_Return_Button.cxx
branches/branch-3.0/src/fl_ask.cxx
branches/branch-3.0/src/forms_compatability.cxx
branches/branch-3.0/src/print_panel.cxx
branches/branch-3.0/src/print_panel.h
branches/branch-3.0/test/button2.cxx
branches/branch-3.0/test/buttons.cxx
Modified: branches/branch-3.0/FL/Fl_Button.H
===================================================================
--- branches/branch-3.0/FL/Fl_Button.H 2010-04-01 15:15:03 UTC (rev 7391)
+++ branches/branch-3.0/FL/Fl_Button.H 2010-04-01 15:56:17 UTC (rev 7392)
@@ -50,15 +50,11 @@
class FL_EXPORT Fl_Button : public Fl_Widget {
-#if 0
- int shortcut_;
- char value_;
- char oldval;
- uchar down_box_;
-
protected:
+#if 0
virtual void draw();
#endif
+ Fl_Button() {}
public:
Modified: branches/branch-3.0/FL/Fl_Return_Button.H
===================================================================
--- branches/branch-3.0/FL/Fl_Return_Button.H 2010-04-01 15:15:03 UTC (rev
7391)
+++ branches/branch-3.0/FL/Fl_Return_Button.H 2010-04-01 15:56:17 UTC (rev
7392)
@@ -28,29 +28,21 @@
/* \file
Fl_Return_Button widget . */
-#ifndef Fl_Return_Button_H
-#define Fl_Return_Button_H
+#ifndef Fltk1_Return_Button_H
+#define Fltk1_Return_Button_H
+
+#include <fltk3/ReturnButton.h>
#include "Fl_Button.H"
-/**
- The Fl_Return_Button is a subclass of Fl_Button that
- generates a callback when it is pressed or when the user presses the
- Enter key. A carriage-return symbol is drawn next to the button label.
- <P ALIGN=CENTER>\image html Fl_Return_Button.gif
- \image latex Fl_Return_Button.eps "Fl_Return_Button" width=4cm
-*/
class FL_EXPORT Fl_Return_Button : public Fl_Button {
protected:
- void draw();
+ // fltk123: void draw();
public:
- int handle(int);
- /**
- Creates a new Fl_Return_Button widget using the given
- position, size, and label string. The default boxtype is FL_UP_BOX.
- <P> The inherited destructor deletes the button.
- */
- Fl_Return_Button(int X, int Y, int W, int H,const char *l=0)
- : Fl_Button(X,Y,W,H,l) {}
+ // fltk123: int handle(int);
+ Fl_Return_Button(int X, int Y, int W, int H,const char *l=0) {
+ _p = new fltk3::ReturnButton(X, Y, W, H, l);
+ _p->wrapper(this);
+ }
};
#endif
Modified: branches/branch-3.0/fltk/Button.h
===================================================================
--- branches/branch-3.0/fltk/Button.h 2010-04-01 15:15:03 UTC (rev 7391)
+++ branches/branch-3.0/fltk/Button.h 2010-04-01 15:56:17 UTC (rev 7392)
@@ -32,6 +32,9 @@
namespace fltk {
class FL_API Button : public Widget {
+protected:
+ Button() {}
+
public:
enum {HIDDEN=3}; // back-comptability value to hide the button
Modified: branches/branch-3.0/fltk/ReturnButton.h
===================================================================
--- branches/branch-3.0/fltk/ReturnButton.h 2010-04-01 15:15:03 UTC (rev
7391)
+++ branches/branch-3.0/fltk/ReturnButton.h 2010-04-01 15:56:17 UTC (rev
7392)
@@ -1,37 +1,23 @@
// "$Id: ReturnButton.h 4886 2006-03-30 09:55:32Z fabien $"
//
-// Copyright 1998-2006 by Bill Spitzak and others.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-//
-// Please report all bugs and problems to "[email protected]".
-#ifndef fltk_ReturnButton_h
-#define fltk_ReturnButton_h
+#ifndef fltk2_ReturnButton_h
+#define fltk2_ReturnButton_h
+#include <fltk3/ReturnButton.h>
#include "Button.h"
namespace fltk {
class FL_API ReturnButton : public Button {
public:
- ReturnButton(int x,int y,int w,int h,const char *l=0);
- static NamedStyle* default_style;
+ ReturnButton(int x,int y,int w,int h,const char *label=0) {
+ _p = new fltk3::ReturnButton(x, y, w, h, label);
+ _p->wrapper(this);
+ }
+ // fltk123: static NamedStyle* default_style;
protected:
- void draw();
+ // fltk123: void draw();
};
}
Modified: branches/branch-3.0/fltk/Widget.h
===================================================================
--- branches/branch-3.0/fltk/Widget.h 2010-04-01 15:15:03 UTC (rev 7391)
+++ branches/branch-3.0/fltk/Widget.h 2010-04-01 15:56:17 UTC (rev 7392)
@@ -87,10 +87,12 @@
const Symbol* image() const { return image_; }
void image(const Symbol* a) { image_ = a; }
void image(const Symbol& a) { image_ = &a; }
+#endif
+
+ const char *tooltip() const { return _p->tooltip(); }
+ void tooltip(const char *t) { _p->tooltip(t); }
- const char *tooltip() const { return tooltip_; }
- void tooltip(const char *t) { tooltip_ = t; }
-
+#if 0
unsigned shortcut() const ;
void shortcut(unsigned key) ;
bool add_shortcut(unsigned key);
Modified: branches/branch-3.0/fltk3/Fl_Color_Chooser.H
===================================================================
--- branches/branch-3.0/fltk3/Fl_Color_Chooser.H 2010-04-01 15:15:03 UTC
(rev 7391)
+++ branches/branch-3.0/fltk3/Fl_Color_Chooser.H 2010-04-01 15:56:17 UTC
(rev 7392)
@@ -37,7 +37,7 @@
#include <fltk3/Group.h>
#include <fltk3/Fl_Box.H>
-#include <fltk3/Fl_Return_Button.H>
+#include <fltk3/ReturnButton.h>
#include <fltk3/Fl_Choice.H>
#include <fltk3/Fl_Value_Input.H>
Modified: branches/branch-3.0/fltk3/Fl_File_Chooser.H
===================================================================
--- branches/branch-3.0/fltk3/Fl_File_Chooser.H 2010-04-01 15:15:03 UTC (rev
7391)
+++ branches/branch-3.0/fltk3/Fl_File_Chooser.H 2010-04-01 15:56:17 UTC (rev
7392)
@@ -44,7 +44,7 @@
#include <fltk3/Fl_Box.H>
#include <fltk3/Fl_Check_Button.H>
#include <fltk3/Fl_File_Input.H>
-#include <fltk3/Fl_Return_Button.H>
+#include <fltk3/ReturnButton.h>
#include <fltk3/ask.h>
class FL_EXPORT Fl_File_Chooser {
@@ -98,9 +98,9 @@
Fl_File_Input *fileName;
void cb_fileName_i(Fl_File_Input*, void*);
static void cb_fileName(Fl_File_Input*, void*);
- Fl_Return_Button *okButton;
- void cb_okButton_i(Fl_Return_Button*, void*);
- static void cb_okButton(Fl_Return_Button*, void*);
+ fltk3::ReturnButton *okButton;
+ void cb_okButton_i(fltk3::ReturnButton*, void*);
+ static void cb_okButton(fltk3::ReturnButton*, void*);
fltk3::Button *cancelButton;
void cb_cancelButton_i(fltk3::Button*, void*);
static void cb_cancelButton(fltk3::Button*, void*);
@@ -120,9 +120,9 @@
fltk3::Button *favCancelButton;
void cb_favCancelButton_i(fltk3::Button*, void*);
static void cb_favCancelButton(fltk3::Button*, void*);
- Fl_Return_Button *favOkButton;
- void cb_favOkButton_i(Fl_Return_Button*, void*);
- static void cb_favOkButton(Fl_Return_Button*, void*);
+ fltk3::ReturnButton *favOkButton;
+ void cb_favOkButton_i(fltk3::ReturnButton*, void*);
+ static void cb_favOkButton(fltk3::ReturnButton*, void*);
public:
~Fl_File_Chooser();
void callback(void (*cb)(Fl_File_Chooser *, void *), void *d = 0);
Modified: branches/branch-3.0/fltk3/Fl_Return_Button.H
===================================================================
--- branches/branch-3.0/fltk3/Fl_Return_Button.H 2010-04-01 15:15:03 UTC
(rev 7391)
+++ branches/branch-3.0/fltk3/Fl_Return_Button.H 2010-04-01 15:56:17 UTC
(rev 7392)
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Return_Button.H 6614 2009-01-01 16:11:32Z matt $"
+// "$Id: ReturnButton.h 6614 2009-01-01 16:11:32Z matt $"
//
// Return button header file for the Fast Light Tool Kit (FLTK).
//
@@ -26,35 +26,35 @@
//
/* \file
- Fl_Return_Button widget . */
+ fltk3::ReturnButton widget . */
#ifndef Fl_Return_Button_H
#define Fl_Return_Button_H
#include "Button.h"
/**
- The Fl_Return_Button is a subclass of fltk3::Button that
+ The fltk3::ReturnButton is a subclass of fltk3::Button that
generates a callback when it is pressed or when the user presses the
Enter key. A carriage-return symbol is drawn next to the button label.
- <P ALIGN=CENTER>\image html Fl_Return_Button.gif
- \image latex Fl_Return_Button.eps "Fl_Return_Button" width=4cm
+ <P ALIGN=CENTER>\image html fltk3::ReturnButton.gif
+ \image latex fltk3::ReturnButton.eps "fltk3::ReturnButton" width=4cm
*/
-class FL_EXPORT Fl_Return_Button : public fltk3::Button {
+class FL_EXPORT fltk3::ReturnButton : public fltk3::Button {
protected:
void draw();
public:
int handle(int);
/**
- Creates a new Fl_Return_Button widget using the given
+ Creates a new fltk3::ReturnButton widget using the given
position, size, and label string. The default boxtype is fltk3::UP_BOX.
<P> The inherited destructor deletes the button.
*/
- Fl_Return_Button(int X, int Y, int W, int H,const char *l=0)
+ fltk3::ReturnButton(int X, int Y, int W, int H,const char *l=0)
: fltk3::Button(X,Y,W,H,l) {}
};
#endif
//
-// End of "$Id: Fl_Return_Button.H 6614 2009-01-01 16:11:32Z matt $".
+// End of "$Id: ReturnButton.h 6614 2009-01-01 16:11:32Z matt $".
//
Copied: branches/branch-3.0/fltk3/ReturnButton.h (from rev 7384,
branches/branch-3.0/fltk3/Fl_Return_Button.H)
===================================================================
--- branches/branch-3.0/fltk3/ReturnButton.h (rev 0)
+++ branches/branch-3.0/fltk3/ReturnButton.h 2010-04-01 15:56:17 UTC (rev
7392)
@@ -0,0 +1,65 @@
+//
+// "$Id: ReturnButton.h 6614 2009-01-01 16:11:32Z matt $"
+//
+// Return button header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2009 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+/* \file
+ ReturnButton widget . */
+
+#ifndef Fltk3_Return_Button_H
+#define Fltk3_Return_Button_H
+
+#include "Button.h"
+
+namespace fltk3 {
+
+/**
+ The ReturnButton is a subclass of Button that
+ generates a callback when it is pressed or when the user presses the
+ Enter key. A carriage-return symbol is drawn next to the button label.
+ <P ALIGN=CENTER>\image html fltk3::ReturnButton.gif
+ \image latex fltk3::ReturnButton.eps "fltk3::ReturnButton" width=4cm
+*/
+class FL_EXPORT ReturnButton : public Button {
+protected:
+ void draw();
+public:
+ int handle(int);
+ /**
+ Creates a new ReturnButton widget using the given
+ position, size, and label string. The default boxtype is UP_BOX.
+ <P> The inherited destructor deletes the button.
+ */
+ ReturnButton(int X, int Y, int W, int H,const char *l=0)
+ : Button(X,Y,W,H,l) {}
+};
+
+}
+
+#endif
+
+//
+// End of "$Id: ReturnButton.h 6614 2009-01-01 16:11:32Z matt $".
+//
Modified: branches/branch-3.0/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
2010-04-01 15:15:03 UTC (rev 7391)
+++ branches/branch-3.0/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
2010-04-01 15:56:17 UTC (rev 7392)
@@ -482,6 +482,18 @@
C978315D1164915600491051 /* boxtype2.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97831321164913700491051 /* boxtype2.cxx */; };
C978315F1164915600491051 /* fltk.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
C97831611164915600491051 /* fltk.framework in CopyFiles */ =
{isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
+ C97832CF1164F04B00491051 /* buttons1.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97832CD1164F04A00491051 /* buttons1.cxx */; };
+ C97832D01164F04B00491051 /* buttons2.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97832CE1164F04A00491051 /* buttons2.cxx */; };
+ C97832D11164F04B00491051 /* buttons1.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97832CD1164F04A00491051 /* buttons1.cxx */; };
+ C97832D21164F04B00491051 /* buttons2.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97832CE1164F04A00491051 /* buttons2.cxx */; };
+ C97832D31164F04B00491051 /* buttons1.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97832CD1164F04A00491051 /* buttons1.cxx */; };
+ C97832D41164F04B00491051 /* buttons2.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97832CE1164F04A00491051 /* buttons2.cxx */; };
+ C97832DE1164F05800491051 /* buttons1.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97832CD1164F04A00491051 /* buttons1.cxx */; };
+ C97832E11164F05800491051 /* fltk.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
+ C97832E31164F05800491051 /* fltk.framework in CopyFiles */ =
{isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
+ C97832F91164F06200491051 /* buttons2.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C97832CE1164F04A00491051 /* buttons2.cxx */; };
+ C97832FB1164F06200491051 /* fltk.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
+ C97832FD1164F06200491051 /* fltk.framework in CopyFiles */ =
{isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
C9C84B2983DC793B141DDC70 /* ide_maketools.cxx in Sources */ =
{isa = PBXBuildFile; fileRef = B65FCD2B8489E2BBAA3F695A /* ide_maketools.cxx
*/; };
C9C9079111626697006C5014 /* fltk.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
C9C9079311626697006C5014 /* fltk.framework in CopyFiles */ =
{isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
@@ -1436,6 +1448,30 @@
);
script = "export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
};
+ C97832E41164F05800491051 /* PBXBuildRule */ = {
+ isa = PBXBuildRule;
+ compilerSpec = com.apple.compilers.proxy.script;
+ filePatterns = "*.fl";
+ fileType = pattern.proxy;
+ isEditable = 1;
+ outputFiles = (
+ "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.cxx",
+ "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.h",
+ );
+ script = "export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
+ };
+ C97832FE1164F06200491051 /* PBXBuildRule */ = {
+ isa = PBXBuildRule;
+ compilerSpec = com.apple.compilers.proxy.script;
+ filePatterns = "*.fl";
+ fileType = pattern.proxy;
+ isEditable = 1;
+ outputFiles = (
+ "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.cxx",
+ "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.h",
+ );
+ script = "export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
+ };
C9C9079411626697006C5014 /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.proxy.script;
@@ -2655,6 +2691,20 @@
remoteGlobalIDString = E379F105C5DD998B9B72950E;
remoteInfo = fltk;
};
+ C97832DA1164F05800491051 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 2E06DFE475DEE3090F8EA260 /* Project
object */;
+ proxyType = 1;
+ remoteGlobalIDString = E379F105C5DD998B9B72950E;
+ remoteInfo = fltk;
+ };
+ C97832F41164F06200491051 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 2E06DFE475DEE3090F8EA260 /* Project
object */;
+ proxyType = 1;
+ remoteGlobalIDString = E379F105C5DD998B9B72950E;
+ remoteInfo = fltk;
+ };
C9BE0900956B8DE28740E8C6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2E06DFE475DEE3090F8EA260 /* Project
object */;
@@ -3677,6 +3727,26 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C97832E21164F05800491051 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C97832E31164F05800491051 /* fltk.framework in
CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C97832FC1164F06200491051 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C97832FD1164F06200491051 /* fltk.framework in
CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
C9C9079211626697006C5014 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -4167,6 +4237,12 @@
C97831541164914B00491051 /* boxtype-Info copy.plist */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.xml; name = "boxtype-Info
copy.plist"; path = "plists/boxtype-Info copy.plist"; sourceTree = "<group>"; };
C97831661164915600491051 /* boxtype2.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = boxtype2.app; sourceTree = BUILT_PRODUCTS_DIR; };
C978316E1164915700491051 /* boxtype-Info copy 2.plist */ = {isa
= PBXFileReference; lastKnownFileType = text.plist.xml; name = "boxtype-Info
copy 2.plist"; path = "plists/boxtype-Info copy 2.plist"; sourceTree =
"<group>"; };
+ C97832CD1164F04A00491051 /* buttons1.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = buttons1.cxx; path = ../../test/buttons1.cxx; sourceTree = SOURCE_ROOT;
};
+ C97832CE1164F04A00491051 /* buttons2.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = buttons2.cxx; path = ../../test/buttons2.cxx; sourceTree = SOURCE_ROOT;
};
+ C97832E81164F05800491051 /* buttons1.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = buttons1.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ C97832F01164F05900491051 /* buttons-Info copy.plist */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.xml; name = "buttons-Info
copy.plist"; path = "plists/buttons-Info copy.plist"; sourceTree = "<group>"; };
+ C97833021164F06200491051 /* buttons2.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = buttons2.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ C978330A1164F06300491051 /* buttons-Info copy 2.plist */ = {isa
= PBXFileReference; lastKnownFileType = text.plist.xml; name = "buttons-Info
copy 2.plist"; path = "plists/buttons-Info copy 2.plist"; sourceTree =
"<group>"; };
C9C9079811626697006C5014 /* hello1.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = hello1.app; sourceTree = BUILT_PRODUCTS_DIR; };
C9C907A011626698006C5014 /* hello-Info copy.plist */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.xml; name = "hello-Info
copy.plist"; path = "plists/hello-Info copy.plist"; sourceTree = "<group>"; };
C9C907B2116266AA006C5014 /* hello2.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = hello2.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -4799,6 +4875,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C97832E01164F05800491051 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ C97832E11164F05800491051 /* fltk.framework in
Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C97832FA1164F06200491051 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ C97832FB1164F06200491051 /* fltk.framework in
Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
C9C9079011626697006C5014 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -5059,6 +5151,8 @@
7806C7AA99FE626675560AF1 /* Tests */,
7DC38200FBE41638B7195263 /* Products */,
C97832A21164EC3A00491051 /* plists */,
+ C97832F01164F05900491051 /* buttons-Info
copy.plist */,
+ C978330A1164F06300491051 /* buttons-Info copy
2.plist */,
);
sourceTree = "<group>";
};
@@ -5657,6 +5751,8 @@
C9782F841163CD3800491051 /* button2.app */,
C978314C1164914A00491051 /* boxtype1.app */,
C97831661164915600491051 /* boxtype2.app */,
+ C97832E81164F05800491051 /* buttons1.app */,
+ C97833021164F06200491051 /* buttons2.app */,
);
name = Products;
sourceTree = "<group>";
@@ -5769,6 +5865,8 @@
isa = PBXGroup;
children = (
12D3F29F27BA74089591E38D /* buttons.cxx */,
+ C97832CD1164F04A00491051 /* buttons1.cxx */,
+ C97832CE1164F04A00491051 /* buttons2.cxx */,
);
name = buttons;
sourceTree = "<group>";
@@ -7446,6 +7544,46 @@
productReference = C97831661164915600491051 /*
boxtype2.app */;
productType = "com.apple.product-type.application";
};
+ C97832D81164F05800491051 /* buttons1 */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = C97832E51164F05800491051 /*
Build configuration list for PBXNativeTarget "buttons1" */;
+ buildPhases = (
+ C97832DB1164F05800491051 /* Resources */,
+ C97832DC1164F05800491051 /* Sources */,
+ C97832E01164F05800491051 /* Frameworks */,
+ C97832E21164F05800491051 /* CopyFiles */,
+ );
+ buildRules = (
+ C97832E41164F05800491051 /* PBXBuildRule */,
+ );
+ dependencies = (
+ C97832D91164F05800491051 /* PBXTargetDependency
*/,
+ );
+ name = buttons1;
+ productName = buttons;
+ productReference = C97832E81164F05800491051 /*
buttons1.app */;
+ productType = "com.apple.product-type.application";
+ };
+ C97832F21164F06200491051 /* buttons2 */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = C97832FF1164F06200491051 /*
Build configuration list for PBXNativeTarget "buttons2" */;
+ buildPhases = (
+ C97832F51164F06200491051 /* Resources */,
+ C97832F61164F06200491051 /* Sources */,
+ C97832FA1164F06200491051 /* Frameworks */,
+ C97832FC1164F06200491051 /* CopyFiles */,
+ );
+ buildRules = (
+ C97832FE1164F06200491051 /* PBXBuildRule */,
+ );
+ dependencies = (
+ C97832F31164F06200491051 /* PBXTargetDependency
*/,
+ );
+ name = buttons2;
+ productName = buttons;
+ productReference = C97833021164F06200491051 /*
buttons2.app */;
+ productType = "com.apple.product-type.application";
+ };
C9C9078A11626697006C5014 /* hello1 */ = {
isa = PBXNativeTarget;
buildConfigurationList = C9C9079511626697006C5014 /*
Build configuration list for PBXNativeTarget "hello1" */;
@@ -7946,6 +8084,8 @@
5C27633EE545BAAEA44DE35E /* blocks */,
10D3DB5803F7FAFEC8290342 /* browser */,
ED5180E0F3CCE83524692330 /* buttons */,
+ C97832D81164F05800491051 /* buttons1 */,
+ C97832F21164F06200491051 /* buttons2 */,
EFFB6C29A0C01196ACBA347E /* checkers */,
3967C5131A455EAC4307432E /* clock */,
FC53F38F68F40136797FFA65 /* colbrowser */,
@@ -8424,6 +8564,20 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C97832DB1164F05800491051 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C97832F51164F06200491051 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
C9C9078D11626697006C5014 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -8882,6 +9036,8 @@
C9782F9C1163CD9800491051 /* button2.cxx in
Sources */,
C97831331164913800491051 /* boxtype1.cxx in
Sources */,
C97831341164913800491051 /* boxtype2.cxx in
Sources */,
+ C97832CF1164F04B00491051 /* buttons1.cxx in
Sources */,
+ C97832D01164F04B00491051 /* buttons2.cxx in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9372,6 +9528,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C97832DC1164F05800491051 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ C97832DE1164F05800491051 /* buttons1.cxx in
Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C97832F61164F06200491051 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ C97832F91164F06200491051 /* buttons2.cxx in
Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
C9C9078E11626697006C5014 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -9381,6 +9553,8 @@
C9782FA01163CD9800491051 /* button2.cxx in
Sources */,
C97831371164913800491051 /* boxtype1.cxx in
Sources */,
C97831381164913800491051 /* boxtype2.cxx in
Sources */,
+ C97832D31164F04B00491051 /* buttons1.cxx in
Sources */,
+ C97832D41164F04B00491051 /* buttons2.cxx in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9393,6 +9567,8 @@
C9782F9E1163CD9800491051 /* button2.cxx in
Sources */,
C97831351164913800491051 /* boxtype1.cxx in
Sources */,
C97831361164913800491051 /* boxtype2.cxx in
Sources */,
+ C97832D11164F04B00491051 /* buttons1.cxx in
Sources */,
+ C97832D21164F04B00491051 /* buttons2.cxx in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10364,6 +10540,16 @@
target = E379F105C5DD998B9B72950E /* fltk */;
targetProxy = C97831581164915600491051 /*
PBXContainerItemProxy */;
};
+ C97832D91164F05800491051 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = E379F105C5DD998B9B72950E /* fltk */;
+ targetProxy = C97832DA1164F05800491051 /*
PBXContainerItemProxy */;
+ };
+ C97832F31164F06200491051 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = E379F105C5DD998B9B72950E /* fltk */;
+ targetProxy = C97832F41164F06200491051 /*
PBXContainerItemProxy */;
+ };
C98D072A1E10A81ACDB66C3B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E379F105C5DD998B9B72950E /* fltk */;
@@ -14870,6 +15056,136 @@
};
name = Release;
};
+ C97832E61164F05800491051 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = fltk.pch;
+ GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1";
+ HEADER_SEARCH_PATHS = (
+ ../../ide/XCode3/,
+ ../../,
+ ../../png,
+ ../../jpeg,
+ );
+ INFOPLIST_FILE = "plists/buttons-Info
copy.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
+ OTHER_LDFLAGS = (
+ "-framework",
+ Cocoa,
+ "-framework",
+ Carbon,
+ );
+ PRODUCT_NAME = buttons1;
+ WARNING_CFLAGS = (
+ "-Wno-format-security",
+ "-Wall",
+ );
+ };
+ name = Debug;
+ };
+ C97832E71164F05800491051 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = fltk.pch;
+ GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1";
+ HEADER_SEARCH_PATHS = (
+ ../../ide/XCode3/,
+ ../../,
+ ../../png,
+ ../../jpeg,
+ );
+ INFOPLIST_FILE = "plists/buttons-Info
copy.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
+ OTHER_LDFLAGS = (
+ "-framework",
+ Cocoa,
+ "-framework",
+ Carbon,
+ );
+ PRODUCT_NAME = buttons1;
+ WARNING_CFLAGS = (
+ "-Wno-format-security",
+ "-Wall",
+ );
+ };
+ name = Release;
+ };
+ C97833001164F06200491051 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = fltk.pch;
+ GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1";
+ HEADER_SEARCH_PATHS = (
+ ../../ide/XCode3/,
+ ../../,
+ ../../png,
+ ../../jpeg,
+ );
+ INFOPLIST_FILE = "plists/buttons-Info copy
2.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
+ OTHER_LDFLAGS = (
+ "-framework",
+ Cocoa,
+ "-framework",
+ Carbon,
+ );
+ PRODUCT_NAME = buttons2;
+ WARNING_CFLAGS = (
+ "-Wno-format-security",
+ "-Wall",
+ );
+ };
+ name = Debug;
+ };
+ C97833011164F06200491051 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = fltk.pch;
+ GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1";
+ HEADER_SEARCH_PATHS = (
+ ../../ide/XCode3/,
+ ../../,
+ ../../png,
+ ../../jpeg,
+ );
+ INFOPLIST_FILE = "plists/buttons-Info copy
2.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
+ OTHER_LDFLAGS = (
+ "-framework",
+ Cocoa,
+ "-framework",
+ Carbon,
+ );
+ PRODUCT_NAME = buttons2;
+ WARNING_CFLAGS = (
+ "-Wno-format-security",
+ "-Wall",
+ );
+ };
+ name = Release;
+ };
C9C9079611626697006C5014 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -16532,6 +16848,24 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
+ C97832E51164F05800491051 /* Build configuration list for
PBXNativeTarget "buttons1" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C97832E61164F05800491051 /* Debug */,
+ C97832E71164F05800491051 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
+ C97832FF1164F06200491051 /* Build configuration list for
PBXNativeTarget "buttons2" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C97833001164F06200491051 /* Debug */,
+ C97833011164F06200491051 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
C9C9079511626697006C5014 /* Build configuration list for
PBXNativeTarget "hello1" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: branches/branch-3.0/ide/Xcode3/plists/buttons-Info.plist
===================================================================
--- branches/branch-3.0/ide/Xcode3/plists/buttons-Info.plist 2010-04-01
15:15:03 UTC (rev 7391)
+++ branches/branch-3.0/ide/Xcode3/plists/buttons-Info.plist 2010-04-01
15:56:17 UTC (rev 7392)
@@ -17,4 +17,4 @@
<key>CFBundleVersion</key>
<string>1.0</string>
</dict>
- </plist>
+</plist>
Modified: branches/branch-3.0/src/Fl_Color_Chooser.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Color_Chooser.cxx 2010-04-01 15:15:03 UTC
(rev 7391)
+++ branches/branch-3.0/src/Fl_Color_Chooser.cxx 2010-04-01 15:56:17 UTC
(rev 7392)
@@ -29,7 +29,7 @@
#include <fltk3/Fl_Color_Chooser.H>
#include <fltk3/Window.h>
#include <fltk3/Fl_Box.H>
-#include <fltk3/Fl_Return_Button.H>
+#include <fltk3/ReturnButton.h>
#include <fltk3/fl_draw.H>
#include <fltk3/math.h>
#include <fltk3/ask.h>
@@ -567,7 +567,7 @@
window.callback(cc_cancel_cb,&ret);
Fl_Color_Chooser chooser(10, 10, 195, 115);
ColorChip ok_color(10, 130, 95, 25);
- Fl_Return_Button ok_button(10, 165, 95, 25, fltk3::text_ok);
+ fltk3::ReturnButton ok_button(10, 165, 95, 25, fltk3::text_ok);
ok_button.callback(cc_ok_cb,&ret);
ColorChip cancel_color(110, 130, 95, 25);
cancel_color.r = uchar(255*r+.5); ok_color.r = cancel_color.r;
Modified: branches/branch-3.0/src/Fl_File_Chooser.cxx
===================================================================
--- branches/branch-3.0/src/Fl_File_Chooser.cxx 2010-04-01 15:15:03 UTC (rev
7391)
+++ branches/branch-3.0/src/Fl_File_Chooser.cxx 2010-04-01 15:56:17 UTC (rev
7392)
@@ -95,14 +95,14 @@
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_fileName_i(o,v);
}
-void Fl_File_Chooser::cb_okButton_i(Fl_Return_Button*, void*) {
+void Fl_File_Chooser::cb_okButton_i(fltk3::ReturnButton*, void*) {
window->hide();
// Do any callback that is registered...
if (callback_)
(*callback_)(this, data_);
}
-void Fl_File_Chooser::cb_okButton(Fl_Return_Button* o, void* v) {
+void Fl_File_Chooser::cb_okButton(fltk3::ReturnButton* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_okButton_i(o,v);
}
@@ -151,10 +151,10 @@
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favCancelButton_i(o,v);
}
-void Fl_File_Chooser::cb_favOkButton_i(Fl_Return_Button*, void*) {
+void Fl_File_Chooser::cb_favOkButton_i(fltk3::ReturnButton*, void*) {
favoritesCB(favOkButton);
}
-void Fl_File_Chooser::cb_favOkButton(Fl_Return_Button* o, void* v) {
+void Fl_File_Chooser::cb_favOkButton(fltk3::ReturnButton* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favOkButton_i(o,v);
}
@@ -226,10 +226,10 @@
o->label(filename_label);
} // Fl_Box* o
{ fltk3::Group* o = new fltk3::Group(10, 345, 470, 25);
- { okButton = new Fl_Return_Button(313, 345, 85, 25, "OK");
+ { okButton = new fltk3::ReturnButton(313, 345, 85, 25, "OK");
okButton->callback((fltk3::Callback*)cb_okButton);
okButton->label(fltk3::text_ok);
- } // Fl_Return_Button* okButton
+ } // fltk3::ReturnButton* okButton
{ fltk3::Button* o = cancelButton = new fltk3::Button(408, 345, 72,
25, "Cancel");
cancelButton->callback((fltk3::Callback*)cb_cancelButton);
o->label(fltk3::text_cancel);
@@ -271,10 +271,10 @@
favCancelButton->callback((fltk3::Callback*)cb_favCancelButton);
favCancelButton->label(fltk3::text_cancel);
} // fltk3::Button* favCancelButton
- { favOkButton = new Fl_Return_Button(181, 115, 79, 25, "Save");
+ { favOkButton = new fltk3::ReturnButton(181, 115, 79, 25, "Save");
favOkButton->callback((fltk3::Callback*)cb_favOkButton);
favOkButton->label(save_label);
- } // Fl_Return_Button* favOkButton
+ } // fltk3::ReturnButton* favOkButton
{ Fl_Box* o = new Fl_Box(10, 115, 161, 25);
fltk3::Group::current()->resizable(o);
} // Fl_Box* o
Modified: branches/branch-3.0/src/Fl_Return_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Return_Button.cxx 2010-04-01 15:15:03 UTC
(rev 7391)
+++ branches/branch-3.0/src/Fl_Return_Button.cxx 2010-04-01 15:56:17 UTC
(rev 7392)
@@ -26,7 +26,7 @@
//
#include <fltk3/run.h>
-#include <fltk3/Fl_Return_Button.H>
+#include <fltk3/ReturnButton.h>
#include <fltk3/fl_draw.H>
int fl_return_arrow(int x, int y, int w, int h) {
@@ -47,7 +47,7 @@
return 1;
}
-void Fl_Return_Button::draw() {
+void fltk3::ReturnButton::draw() {
if (type() == FL_HIDDEN_BUTTON) return;
draw_box(value() ? (down_box()?down_box():fl_down(box())) : box(),
value() ? selection_color() : color());
@@ -58,7 +58,7 @@
if (fltk3::focus() == this) draw_focus();
}
-int Fl_Return_Button::handle(int event) {
+int fltk3::ReturnButton::handle(int event) {
if (event == fltk3::SHORTCUT &&
(fltk3::event_key() == FL_Enter || fltk3::event_key() == FL_KP_Enter)) {
do_callback();
Modified: branches/branch-3.0/src/fl_ask.cxx
===================================================================
--- branches/branch-3.0/src/fl_ask.cxx 2010-04-01 15:15:03 UTC (rev 7391)
+++ branches/branch-3.0/src/fl_ask.cxx 2010-04-01 15:56:17 UTC (rev 7392)
@@ -40,7 +40,7 @@
#include <fltk3/Fl_Box.H>
#include <fltk3/Button.h>
-#include <fltk3/Fl_Return_Button.H>
+#include <fltk3/ReturnButton.h>
#include <fltk3/Window.h>
#include <fltk3/Fl_Input.H>
#include <fltk3/Fl_Secret_Input.H>
Modified: branches/branch-3.0/src/forms_compatability.cxx
===================================================================
--- branches/branch-3.0/src/forms_compatability.cxx 2010-04-01 15:15:03 UTC
(rev 7391)
+++ branches/branch-3.0/src/forms_compatability.cxx 2010-04-01 15:56:17 UTC
(rev 7392)
@@ -148,7 +148,7 @@
// Create a forms button by selecting correct fltk subclass:
-#include <fltk3/Fl_Return_Button.H>
+#include <fltk3/ReturnButton.h>
#include <fltk3/Fl_Repeat_Button.H>
fltk3::Button *fl_add_button(uchar t,int x,int y,int w,int h,const char *l) {
@@ -156,7 +156,7 @@
switch (t) {
case FL_RETURN_BUTTON:
case FL_HIDDEN_RET_BUTTON:
- b = new Fl_Return_Button(x,y,w,h,l);
+ b = new fltk3::ReturnButton(x,y,w,h,l);
break;
case FL_TOUCH_BUTTON:
b = new Fl_Repeat_Button(x,y,w,h,l);
Modified: branches/branch-3.0/src/print_panel.cxx
===================================================================
--- branches/branch-3.0/src/print_panel.cxx 2010-04-01 15:15:03 UTC (rev
7391)
+++ branches/branch-3.0/src/print_panel.cxx 2010-04-01 15:56:17 UTC (rev
7392)
@@ -242,7 +242,7 @@
static fltk3::Button *print_output_mode[4]={(fltk3::Button *)0};
-static void cb_Save(Fl_Return_Button*, void*) {
+static void cb_Save(fltk3::ReturnButton*, void*) {
print_properties_panel->hide();
char name[1024];
@@ -457,9 +457,9 @@
} // fltk3::Group* print_collate_group[1]
o->end();
} // fltk3::Group* o
- { Fl_Return_Button* o = new Fl_Return_Button(279, 201, 100, 25,
Fl_Printer::dialog_print_button);
+ { fltk3::ReturnButton* o = new fltk3::ReturnButton(279, 201, 100, 25,
Fl_Printer::dialog_print_button);
o->callback((fltk3::Callback*)print_cb);
- } // Fl_Return_Button* o
+ } // fltk3::ReturnButton* o
{ fltk3::Button* o = new fltk3::Button(389, 201, 68, 25,
Fl_Printer::dialog_cancel_button);
o->callback((fltk3::Callback*)cb_Cancel);
} // fltk3::Button* o
@@ -517,9 +517,9 @@
} // fltk3::Button* print_output_mode[3]
o->end();
} // fltk3::Group* o
- { Fl_Return_Button* o = new Fl_Return_Button(93, 95, 99, 25,
Fl_Printer::property_save);
+ { fltk3::ReturnButton* o = new fltk3::ReturnButton(93, 95, 99, 25,
Fl_Printer::property_save);
o->callback((fltk3::Callback*)cb_Save);
- } // Fl_Return_Button* o
+ } // fltk3::ReturnButton* o
{ fltk3::Button* o = new fltk3::Button(202, 95, 78, 25,
Fl_Printer::property_cancel);
o->callback((fltk3::Callback*)cb_Cancel1);
} // fltk3::Button* o
@@ -532,7 +532,7 @@
return print_properties_panel;
}
-void print_cb(Fl_Return_Button *, void *) {
+void print_cb(fltk3::ReturnButton *, void *) {
print_start = 1;
print_panel->hide();
}
Modified: branches/branch-3.0/src/print_panel.h
===================================================================
--- branches/branch-3.0/src/print_panel.h 2010-04-01 15:15:03 UTC (rev
7391)
+++ branches/branch-3.0/src/print_panel.h 2010-04-01 15:56:17 UTC (rev
7392)
@@ -42,10 +42,10 @@
#include <fltk3/Fl_Input.H>
#include <fltk3/Fl_Spinner.H>
#include <fltk3/Fl_Check_Button.H>
-#include <fltk3/Fl_Return_Button.H>
+#include <fltk3/ReturnButton.h>
#include <fltk3/Fl_Progress.H>
static fltk3::DoubleBufferWindow* make_print_panel();
-static void print_cb(Fl_Return_Button *, void *);
+static void print_cb(fltk3::ReturnButton *, void *);
static void print_load();
static void print_update_status();
#endif
Modified: branches/branch-3.0/test/button2.cxx
===================================================================
--- branches/branch-3.0/test/button2.cxx 2010-04-01 15:15:03 UTC (rev
7391)
+++ branches/branch-3.0/test/button2.cxx 2010-04-01 15:56:17 UTC (rev
7392)
@@ -1,9 +1,9 @@
//
// "$Id$"
//
-// Button/callback test program for the Fast Light Tool Kit (FLTK).
+// Draws the image for the manual
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2006 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -20,52 +20,135 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
-// Please report all bugs and problems on the following page:
+// Please report all bugs and problems to "[email protected]".
//
-// http://www.fltk.org/str.php
-//
#include <stdlib.h>
#include <stdio.h>
#include <fltk/run.h>
-#include <fltk/ask.h>
#include <fltk/Window.h>
#include <fltk/Button.h>
-#include <fltk/InvisibleBox.h>
-//#include <fltk/TiledImage.h>
-//#include <fltk/SharedImage.h>
+#include <fltk/ToggleButton.h>
+#include <fltk/ReturnButton.h>
+#include <fltk/RepeatButton.h>
+#include <fltk/CheckButton.h>
+#include <fltk/RadioButton.h>
+#include <fltk/LightButton.h>
+#include <fltk/HighlightButton.h>
+#include <fltk/MultiImage.h>
+#include <fltk/xpmImage.h>
+#include <fltk/SharedImage.h>
+#include <pixmaps/folder_small.xpm>
+#include <pixmaps/folder_small2.xpm>
+#include <pixmaps/folder_small3.xpm>
+
using namespace fltk;
-void beepcb(Widget *, void *) {
- beep();
+Button * abutton=0;
+MultiImage* multi;
+
+void cb_active_butt(Widget*, void*) {
+ static bool flip = true;
+ if (flip) abutton->activate(); else abutton->deactivate();
+ abutton->label(flip ? "Active" : "Inactive");
+ flip = !flip;
+
+ abutton->redraw();
}
-void exitcb(Widget *, void *) {
- exit(0);
+void rb_cb(Widget*, void*) {
+ static bool flip = false;
+ if (flip) { // Fl::theme("essai");
+ reset_theme();
+ } else {
+ // Default Style handling for changing the scheme of all widget at once
+ Button::default_style->box_ = fltk::PLASTIC_UP_BOX;
+ Button::default_style->color_ = 256-36;
+ Widget::default_style->highlight_color(3);
+ }
+ flip = !flip;
+ redraw();
}
+const int W = 150;
+const int H = 24;
+const int B = 10;
+const int X0 = B;
+const int X1 = (B+W+B);
+
int main(int argc, char ** argv) {
- // FLTK123: register_images();
- Window *window = new Window(320,65);
+ Window window(X1+W+B, B+7*(H+B));
+ window.begin();
+
+ xpmImage fold1(folder_small);
+ xpmImage fold3(folder_small3);
- window->begin();
- Group* ib = new Group(0,0,window->w(),window->h());
- ib->begin();
- // FLTK123: ib->image(new TiledImage(SharedImage::get("./images/bg.jpeg")));
- window->resizable(ib);
+ xpmImage fold2(folder_small2);
+#if !defined(TESTIMAGES)
+ xpmImage ifold2(folder_small2); // use closed folder 2 as inactive image
+#else
+ register_images();
+ SharedImage& ifold2 = *SharedImage::get("images/testimg2.jpg");
+ //SharedImage& ifold2 = *SharedImage::get("images/coucou.png");
+#endif
+ // ifold2.inactive();
+ // WAS: inactive() is nyi but should not be a problem with new Image...
+ MultiImage push_release_img(fold2, PUSHED, fold3);
+ MultiImage push_release_hlt_img(fold2, HIGHLIGHT, fold1, PUSHED, fold3);
+
+ int Y = B;
+ (void) new Button(X0, Y, W, H, "Button");
+ ReturnButton* rb = new ReturnButton(X1, Y, W, H, "Flip theme");
+ rb->callback(rb_cb);
+ rb->tooltip("Push this to revert style to fltk defaults");
+ Y += H+B;
+ (void) new ToggleButton(X0, Y, W, H, "ToggleButton");
+ (void) new RadioButton(X1, Y, W, H, "RadioButton");
+ Y += H+B;
+ (void) new RepeatButton(X0, Y, W, H, "RepeatButton");
+ (void) new RadioButton(X1, Y, W, H, "RadioButton");
+ Y += H+B;
+ (void) new LightButton(X0, Y, W, H, "LightButton");
+ (void) new RadioButton(X1, Y, W, H, "RadioButton");
+ Y += H+B;
+ // The box of the higlight button will appear when belowmouse
+ // when combined with image() as below, you get the border + the image
appearing when belowmouse()
- Button *b1 = new Button(20, 20, 80, 25, "&Beep");
- b1->callback(beepcb,0);
+ //HighlightButton* hb =
+ new HighlightButton(X0, Y, W, H, "HighlightButton");
+
+ new CheckButton(X1, Y, W, H, "CheckButton");
+
+ Y += H+B;
+ Button * b = new Button(X0, Y, W, H, "push/release img");
+ b->image(push_release_img); // use default & pushed img
+ b = new Button(X1, Y, W, H, "push/rel noborder");
+ b->image(push_release_img); // use default & pushed img
+ b->box(NO_BOX);
- Button *b2 = new Button(120,20, 80, 25, "");
- // FLTK123: b2->image(new
TiledImage(SharedImage::get("./images/coucou.png")));
+ Y += H+B;
+ b = new HighlightButton(X0, Y, W, H, "Everything !");
+ // to remove the belowmouse changing image comment this line:
+ b->image(push_release_hlt_img);
+ b->callback(cb_active_butt);
+#if !defined(TESTIMAGES)
+ abutton = b = new Button(X1, Y, W, H, "Inactive");
+ multi = new MultiImage(fold2, fltk::PUSHED, fold3,fltk::INACTIVE, ifold2);
+ b->image(multi);
+#else
+ abutton = b = new Button(X1, Y, W, H*2, "Inactive");
+ multi = new MultiImage(fold2, fltk::PUSHED, fold3,fltk::INACTIVE, ifold2);
+ b->image(&fold2,&ifold2);
+#endif
+ b->activate(0);
- Button *b3 = new Button(220,20, 80, 25, "E&xit");
- b3->callback(exitcb,0);
- ib->end();
- window->end();
- window->show(argc,argv);
+ window.resizable(window);
+ window.end();
+ window.show(argc,argv);
+
+ rb_cb(0,0); // Default Style handling for changing the scheme of all widget
at once
+
return run();
}
Modified: branches/branch-3.0/test/buttons.cxx
===================================================================
--- branches/branch-3.0/test/buttons.cxx 2010-04-01 15:15:03 UTC (rev
7391)
+++ branches/branch-3.0/test/buttons.cxx 2010-04-01 15:56:17 UTC (rev
7392)
@@ -3,7 +3,7 @@
//
// Another button test program for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -27,27 +27,32 @@
#include <stdlib.h>
#include <stdio.h>
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Return_Button.H>
-#include <FL/Fl_Repeat_Button.H>
-#include <FL/Fl_Check_Button.H>
-#include <FL/Fl_Light_Button.H>
-#include <FL/Fl_Round_Button.H>
-#include <FL/Fl_Tooltip.H>
+#include <fltk3/run.h>
+#include <fltk3/Window.h>
+#include <fltk3/Button.h>
+#include <fltk3/ReturnButton.h>
+// fltk123: #include <fltk3/RepeatButton.h>
+// fltk123: #include <fltk3/CheckButton.h>
+// fltk123: #include <fltk3/LightButton.h>
+// fltk123: #include <fltk3/Fl_Round_Button.h>
+// fltk123: #include <fltk3/Tooltip.h>
+using namespace fltk3;
+
int main(int argc, char ** argv) {
- Fl_Window *window = new Fl_Window(320,130);
- (new Fl_Button(10, 10, 130, 30, "Fl_Button"))->tooltip("This is a Tooltip.");
- new Fl_Return_Button(150, 10, 160, 30, "Fl_Return_Button");
- new Fl_Repeat_Button(10,50,130,30,"Fl_Repeat_Button");
- new Fl_Light_Button(10,90,130,30,"Fl_Light_Button");
- new Fl_Round_Button(150,50,160,30,"Fl_Round_Button");
- new Fl_Check_Button(150,90,160,30,"Fl_Check_Button");
+ Window *window = new Window(320,130);
+ window->begin();
+ {
+ (new Button(10, 10, 130, 30, "Button"))->tooltip("This is a Tooltip.");
+ new ReturnButton(150, 10, 160, 30, "ReturnButton");
+ // fltk123: new RepeatButton(10,50,130,30,"RepeatButton");
+ // fltk123: new LightButton(10,90,130,30,"LightButton");
+ // fltk123: new Fl_Round_Button(150,50,160,30,"Fl_Round_Button");
+ // fltk123: new CheckButton(150,90,160,30,"CheckButton");
+ }
window->end();
window->show(argc,argv);
- return Fl::run();
+ return run();
}
//
Copied: branches/branch-3.0/test/buttons1.cxx (from rev 7370,
branches/branch-3.0/test/buttons.cxx)
===================================================================
--- branches/branch-3.0/test/buttons1.cxx (rev 0)
+++ branches/branch-3.0/test/buttons1.cxx 2010-04-01 15:56:17 UTC (rev
7392)
@@ -0,0 +1,55 @@
+//
+// "$Id$"
+//
+// Another button test program for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2009 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Return_Button.H>
+// fltk123: #include <FL/Fl_Repeat_Button.H>
+// fltk123: #include <FL/Fl_Check_Button.H>
+// fltk123: #include <FL/Fl_Light_Button.H>
+// fltk123: #include <FL/Fl_Round_Button.H>
+// fltk123: #include <FL/Fl_Tooltip.H>
+
+int main(int argc, char ** argv) {
+ Fl_Window *window = new Fl_Window(320,130);
+ (new Fl_Button(10, 10, 130, 30, "Fl_Button"))->tooltip("This is a Tooltip.");
+ new Fl_Return_Button(150, 10, 160, 30, "Fl_Return_Button");
+ // fltk123: new Fl_Repeat_Button(10,50,130,30,"Fl_Repeat_Button");
+ // fltk123: new Fl_Light_Button(10,90,130,30,"Fl_Light_Button");
+ // fltk123: new Fl_Round_Button(150,50,160,30,"Fl_Round_Button");
+ // fltk123: new Fl_Check_Button(150,90,160,30,"Fl_Check_Button");
+ window->end();
+ window->show(argc,argv);
+ return Fl::run();
+}
+
+//
+// End of "$Id$".
+//
Copied: branches/branch-3.0/test/buttons2.cxx (from rev 7370,
branches/branch-3.0/test/buttons.cxx)
===================================================================
--- branches/branch-3.0/test/buttons2.cxx (rev 0)
+++ branches/branch-3.0/test/buttons2.cxx 2010-04-01 15:56:17 UTC (rev
7392)
@@ -0,0 +1,157 @@
+//
+// "$Id$"
+//
+// Draws the image for the manual
+//
+// Copyright 1998-2006 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems to "[email protected]".
+//
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fltk/run.h>
+#include <fltk/Window.h>
+#include <fltk/Button.h>
+// fltk123: #include <fltk/ToggleButton.h>
+#include <fltk/ReturnButton.h>
+// fltk123: #include <fltk/RepeatButton.h>
+// fltk123: #include <fltk/CheckButton.h>
+// fltk123: #include <fltk/RadioButton.h>
+// fltk123: #include <fltk/LightButton.h>
+// fltk123: #include <fltk/HighlightButton.h>
+// fltk123: #include <fltk/MultiImage.h>
+// fltk123: #include <fltk/xpmImage.h>
+// fltk123: #include <fltk/SharedImage.h>
+
+// fltk123: #include <pixmaps/folder_small.xpm>
+// fltk123: #include <pixmaps/folder_small2.xpm>
+// fltk123: #include <pixmaps/folder_small3.xpm>
+
+using namespace fltk;
+
+Button * abutton=0;
+// fltk123: MultiImage* multi;
+
+void cb_active_butt(Widget*, void*) {
+ // fltk123: static bool flip = true;
+ // fltk123: if (flip) abutton->activate(); else abutton->deactivate();
+ // fltk123: abutton->label(flip ? "Active" : "Inactive");
+ // fltk123: flip = !flip;
+
+ // fltk123: abutton->redraw();
+}
+
+void rb_cb(Widget*, void*) {
+ // fltk123: static bool flip = false;
+ // fltk123: if (flip) { // Fl::theme("essai");
+ // fltk123: reset_theme();
+ // fltk123: } else {
+ // Default Style handling for changing the scheme of all widget at once
+ // fltk123: Button::default_style->box_ = fltk::PLASTIC_UP_BOX;
+ // fltk123: Button::default_style->color_ = 256-36;
+ // fltk123: Widget::default_style->highlight_color(3);
+ // fltk123: }
+ // fltk123: flip = !flip;
+ // fltk123: redraw();
+}
+
+const int W = 150;
+const int H = 24;
+const int B = 10;
+const int X0 = B;
+const int X1 = (B+W+B);
+
+int main(int argc, char ** argv) {
+ Window window(X1+W+B, B+7*(H+B));
+ window.begin();
+
+ // fltk123: xpmImage fold1(folder_small);
+ // fltk123: xpmImage fold3(folder_small3);
+
+ // fltk123: xpmImage fold2(folder_small2);
+#if !defined(TESTIMAGES)
+ // fltk123: xpmImage ifold2(folder_small2); // use closed folder 2 as
inactive image
+#else
+ // fltk123: register_images();
+ // fltk123: SharedImage& ifold2 = *SharedImage::get("images/testimg2.jpg");
+ //SharedImage& ifold2 = *SharedImage::get("images/coucou.png");
+#endif
+ // ifold2.inactive();
+ // WAS: inactive() is nyi but should not be a problem with new Image...
+ // fltk123: MultiImage push_release_img(fold2, PUSHED, fold3);
+ // fltk123: MultiImage push_release_hlt_img(fold2, HIGHLIGHT, fold1, PUSHED,
fold3);
+
+ int Y = B;
+ (void) new Button(X0, Y, W, H, "Button");
+ ReturnButton* rb = new ReturnButton(X1, Y, W, H, "Flip theme");
+ rb->callback(rb_cb);
+ rb->tooltip("Push this to revert style to fltk defaults");
+ Y += H+B;
+ // fltk123: (void) new ToggleButton(X0, Y, W, H, "ToggleButton");
+ // fltk123: (void) new RadioButton(X1, Y, W, H, "RadioButton");
+ Y += H+B;
+ // fltk123: (void) new RepeatButton(X0, Y, W, H, "RepeatButton");
+ // fltk123: (void) new RadioButton(X1, Y, W, H, "RadioButton");
+ Y += H+B;
+ // fltk123: (void) new LightButton(X0, Y, W, H, "LightButton");
+ // fltk123: (void) new RadioButton(X1, Y, W, H, "RadioButton");
+ Y += H+B;
+ // The box of the higlight button will appear when belowmouse
+ // when combined with image() as below, you get the border + the image
appearing when belowmouse()
+
+ //HighlightButton* hb =
+ // fltk123: new HighlightButton(X0, Y, W, H, "HighlightButton");
+
+ // fltk123: new CheckButton(X1, Y, W, H, "CheckButton");
+
+ Y += H+B;
+ Button * b = new Button(X0, Y, W, H, "push/release img");
+ // fltk123: b->image(push_release_img); // use default & pushed img
+ b = new Button(X1, Y, W, H, "push/rel noborder");
+ // fltk123: b->image(push_release_img); // use default & pushed img
+ // fltk123: b->box(NO_BOX);
+
+ Y += H+B;
+ // fltk123: b = new HighlightButton(X0, Y, W, H, "Everything !");
+ // to remove the belowmouse changing image comment this line:
+ // fltk123: b->image(push_release_hlt_img);
+ b->callback(cb_active_butt);
+#if !defined(TESTIMAGES)
+ // fltk123: abutton = b = new Button(X1, Y, W, H, "Inactive");
+ // fltk123: multi = new MultiImage(fold2, fltk::PUSHED,
fold3,fltk::INACTIVE, ifold2);
+ // fltk123: b->image(multi);
+#else
+ // fltk123: abutton = b = new Button(X1, Y, W, H*2, "Inactive");
+ // fltk123: multi = new MultiImage(fold2, fltk::PUSHED,
fold3,fltk::INACTIVE, ifold2);
+ // fltk123: b->image(&fold2,&ifold2);
+#endif
+ // fltk123: b->activate(0);
+
+ window.resizable(window);
+ window.end();
+ window.show(argc,argv);
+
+ rb_cb(0,0); // Default Style handling for changing the scheme of all widget
at once
+
+ return run();
+}
+
+//
+// End of "$Id$".
+//
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
