[Fxruby-commits] CVS: FXRuby/fox-includes FXAccelTable.h,1.3,1.4 FXApp.h,1.11,1.12 FXColorBar.h,1.3,
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxruby-commits] CVS: FXRuby/fox-includes FXAccelTable.h,1.3,1.4 FXApp.h,1.11,1.12 FXColorBar.h,1.3,1.4 FXComboBox.h,1.8,1.9 FXDialogBox.h,1.4,1.5 FXStatusline.h,1.4,NONE
|
From: Lyle J. <ly...@us...> - 2002-07-11 18:00:44
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv23879
Modified Files:
FXAccelTable.h FXApp.h FXColorBar.h FXComboBox.h FXDialogBox.h
Removed Files:
FXStatusline.h
Log Message:
Index: FXAccelTable.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXAccelTable.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXAccelTable.h 26 Nov 2001 16:13:03 -0000 1.3
--- FXAccelTable.h 11 Jul 2002 18:00:41 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXACCELTABLE_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXACCELTABLE_H
***************
*** 29,35 ****
#endif
!
!
! struct FXAccelKey;
--- 29,33 ----
#endif
! namespace FX {
***************
*** 41,44 ****
--- 39,49 ----
class FXAPI FXAccelTable : public FXObject {
FXDECLARE(FXAccelTable)
+ protected:
+ struct FXAccelKey {
+ FXObject *target; // Target object of message
+ FXSelector messagedn; // Message being sent
+ FXSelector messageup; // Message being sent
+ FXHotKey code; // Keysym and modifier mask to match
+ };
private:
FXAccelKey *key; // Accelerator table
***************
*** 66,70 ****
/// Return target object of the given accelerator
FXObject* targetOfAccel(FXHotKey hotkey) const;
!
/// Remove mapping for specified hot key
void removeAccel(FXHotKey hotkey);
--- 71,75 ----
/// Return target object of the given accelerator
FXObject* targetOfAccel(FXHotKey hotkey) const;
!
/// Remove mapping for specified hot key
void removeAccel(FXHotKey hotkey);
***************
*** 80,83 ****
--- 85,89 ----
};
+ }
#endif
Index: FXApp.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXApp.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXApp.h 2 Jan 2002 22:23:55 -0000 1.11
--- FXApp.h 11 Jul 2002 18:00:42 -0000 1.12
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXAPP_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXAPP_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 38,41 ****
--- 39,43 ----
class FXRootWindow;
class FXMainWindow;
+ class FXPopup;
class FXFont;
class FXDC;
***************
*** 146,149 ****
--- 148,152 ----
friend class FXTopWindow;
friend class FXMainWindow;
+ friend class FXPopup;
friend class FXFont;
friend class FXVisual;
***************
*** 157,162 ****
// Platform independent private data
void *display; // Display we're talking to
FXRegistry registry; // Application setting registry
- FXWindow *mainWindow; // Main window
FXWindow *focusWindow; // Window which has the focus
FXWindow *cursorWindow; // Window under the cursor
--- 160,165 ----
// Platform independent private data
void *display; // Display we're talking to
+ const FXchar *dpy; // Initial display guess
FXRegistry registry; // Application setting registry
FXWindow *focusWindow; // Window which has the focus
FXWindow *cursorWindow; // Window under the cursor
***************
*** 169,172 ****
--- 172,176 ----
FXWindow *dragWindow; // Drag source window
FXWindow *refresher; // GUI refresher pointer
+ FXPopup *popupWindow; // Current popup window
FXRootWindow *root; // Root window
FXVisual *monoVisual; // Monochrome visual
***************
*** 182,185 ****
--- 186,190 ----
FXint nsignals; // Number of signals
FXFont *normalFont; // Normal font
+ FXFont *stockFont; // Stock font
FXuint maxcolors; // Maximum number of colors to allocate
FXEvent event; // Event
***************
*** 214,217 ****
--- 219,224 ----
FXuint waitcount; // Number of times wait cursor was called
FXCursor *cursor[DEF_ROTATE_CURSOR+1];
+ FXint appArgc; // Argument count
+ const FXchar *const *appArgv; // Argument vector
FXbool initialized; // Has been initialized
***************
*** 229,232 ****
--- 236,243 ----
FXID wmTakeFocus; // Focus explicitly set by app
FXID wmState; // Window state
+ FXID wmNetSupported; // Extended Window Manager states list
+ FXID wmNetState; // Extended Window Manager window state
+ FXID wmNetHMaximized; // Extended Window Manager horizontally maximized
+ FXID wmNetVMaximized; // Extended Window Manager vertically maximized
FXID ddeTargets; // DDE targets atom
FXID ddeAtom; // DDE exchange atom
***************
*** 294,298 ****
FXRectangle xdndRect; // XDND rectangle bounding target
FXID stipples[17]; // Standard stipple bitmaps
- static FXID hInstance; // Global instance handle
void **handles; // Waitable object handles
--- 305,308 ----
***************
*** 306,318 ****
static void signalhandler(int sig);
static void immediatesignalhandler(int sig);
! void dragdropSetData(FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void dragdropGetData(FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void dragdropGetTypes(FXWindow* window,FXDragType*& types,FXuint& numtypes);
! void selectionSetData(FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void selectionGetData(FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void selectionGetTypes(FXWindow* window,FXDragType*& types,FXuint& numtypes);
! void clipboardSetData(FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void clipboardGetData(FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void clipboardGetTypes(FXWindow* window,FXDragType*& types,FXuint& numtypes);
#ifndef WIN32
void addRepaint(FXID win,FXint x,FXint y,FXint w,FXint h,FXbool synth=0);
--- 316,328 ----
static void signalhandler(int sig);
static void immediatesignalhandler(int sig);
! void dragdropSetData(const FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void dragdropGetData(const FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void dragdropGetTypes(const FXWindow* window,FXDragType*& types,FXuint& numtypes);
! void selectionSetData(const FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void selectionGetData(const FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void selectionGetTypes(const FXWindow* window,FXDragType*& types,FXuint& numtypes);
! void clipboardSetData(const FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void clipboardGetData(const FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void clipboardGetTypes(const FXWindow* window,FXDragType*& types,FXuint& numtypes);
#ifndef WIN32
void addRepaint(FXID win,FXint x,FXint y,FXint w,FXint h,FXbool synth=0);
***************
*** 368,372 ****
/// Connection to display; this is called by init()
! FXbool openDisplay(const FXchar* dpyname=":0");
/// Close connection to the display
--- 378,382 ----
/// Connection to display; this is called by init()
! FXbool openDisplay(const FXchar* dpyname=NULL);
/// Close connection to the display
***************
*** 376,379 ****
--- 386,395 ----
void* getDisplay() const { return display; }
+ /// Get argument count
+ FXint getArgc() const { return appArgc; }
+
+ /// Get argument vector
+ const FXchar *const *getArgv() const { return appArgv; }
+
/// Get default visual
FXVisual* getDefaultVisual() const { return defaultVisual; }
***************
*** 386,390 ****
/// Get root Window
! FXRootWindow* getRoot() const { return root; }
/// Get the window under the cursor, if any
--- 402,406 ----
/// Get root Window
! FXRootWindow* getRootWindow() const { return root; }
/// Get the window under the cursor, if any
***************
*** 394,399 ****
FXWindow *getFocusWindow() const { return focusWindow; }
! /// Get main window, if any
! FXWindow *getMainWindow() const { return mainWindow; }
/// Find window from id
--- 410,415 ----
FXWindow *getFocusWindow() const { return focusWindow; }
! /// Get current popup window, if any
! FXPopup* getPopupWindow() const { return popupWindow; }
/// Find window from id
***************
*** 510,517 ****
/// Return window of current modal loop
! FXWindow* modalWindow() const;
/// Return mode of current modal loop
! FXModality modalModality() const;
/**
--- 526,533 ----
/// Return window of current modal loop
! FXWindow* getModalWindow() const;
/// Return mode of current modal loop
! FXModality getModality() const;
/**
***************
*** 541,545 ****
/// Flush pending repaints
void flush(FXbool sync=FALSE);
!
/**
* Paint all windows marked for repainting.
--- 557,561 ----
/// Flush pending repaints
void flush(FXbool sync=FALSE);
!
/**
* Paint all windows marked for repainting.
***************
*** 662,665 ****
--- 678,683 ----
virtual ~FXApp();
};
+
+ }
#endif
Index: FXColorBar.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorBar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXColorBar.h 17 Jan 2002 23:52:57 -0000 1.3
--- FXColorBar.h 11 Jul 2002 18:00:42 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2001,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORBAR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORBAR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 107,126 ****
void setBarStyle(FXuint style);
! /// Set status line help text for this color well
void setHelpText(const FXString& text){ help=text; }
! /// Get status line help text for this color well
FXString getHelpText() const { return help; }
! /// Set tool tip message for this color well
void setTipText(const FXString& text){ tip=text; }
! /// Get tool tip message for this color well
FXString getTipText() const { return tip; }
! /// Save color well to a stream
virtual void save(FXStream& store) const;
! /// Load color well from a stream
virtual void load(FXStream& store);
--- 108,127 ----
void setBarStyle(FXuint style);
! /// Set status line help text for this color bar
void setHelpText(const FXString& text){ help=text; }
! /// Get status line help text for this color bar
FXString getHelpText() const { return help; }
! /// Set tool tip message for this color bar
void setTipText(const FXString& text){ tip=text; }
! /// Get tool tip message for this color bar
FXString getTipText() const { return tip; }
! /// Save color bar to a stream
virtual void save(FXStream& store) const;
! /// Load color bar from a stream
virtual void load(FXStream& store);
***************
*** 129,132 ****
--- 130,134 ----
};
+ }
#endif
Index: FXComboBox.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXComboBox.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXComboBox.h 27 Feb 2002 19:19:04 -0000 1.8
--- FXComboBox.h 11 Jul 2002 18:00:42 -0000 1.9
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 67,70 ****
--- 68,72 ----
long onFocusUp(FXObject*,FXSelector,void*);
long onFocusDown(FXObject*,FXSelector,void*);
+ long onFocusSelf(FXObject*,FXSelector,void*);
long onTextButton(FXObject*,FXSelector,void*);
long onTextChanged(FXObject*,FXSelector,void*);
***************
*** 244,248 ****
};
!
#endif
--- 246,250 ----
};
! }
#endif
Index: FXDialogBox.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDialogBox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXDialogBox.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXDialogBox.h 11 Jul 2002 18:00:42 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIALOGBOX_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIALOGBOX_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 47,51 ****
long onKeyPress(FXObject*,FXSelector,void*);
long onKeyRelease(FXObject*,FXSelector,void*);
- long onClose(FXObject*,FXSelector,void*);
long onCmdAccept(FXObject*,FXSelector,void*);
long onCmdCancel(FXObject*,FXSelector,void*);
--- 48,51 ----
***************
*** 68,71 ****
--- 68,72 ----
};
+ }
#endif
--- FXStatusline.h DELETED ---
|
