Browse Source

* skins2/*: cosmetic changes

pull/2/head
Olivier Teulière 21 years ago
parent
commit
124b9a6db2
  1. 4
      modules/gui/skins2/controls/ctrl_image.hpp
  2. 4
      modules/gui/skins2/events/evt_key.hpp
  3. 8
      modules/gui/skins2/events/evt_mouse.hpp
  4. 4
      modules/gui/skins2/events/evt_scroll.hpp
  5. 4
      modules/gui/skins2/events/evt_special.hpp
  6. 4
      modules/gui/skins2/src/dialogs.hpp
  7. 4
      modules/gui/skins2/src/os_factory.hpp
  8. 4
      modules/gui/skins2/utils/bezier.hpp
  9. 4
      modules/gui/skins2/utils/position.hpp

4
modules/gui/skins2/controls/ctrl_image.hpp

@ -37,11 +37,11 @@ class CtrlImage: public CtrlFlat
{
public:
/// Resize methods
typedef enum
enum resize_t
{
kMosaic, // Repeat the base image in a mosaic
kScale // Scale the base image
} resize_t;
};
// Create an image with the given bitmap (which is NOT copied)
CtrlImage( intf_thread_t *pIntf, const GenericBitmap &rBitmap,

4
modules/gui/skins2/events/evt_key.hpp

@ -32,11 +32,11 @@
class EvtKey: public EvtInput
{
public:
typedef enum
enum ActionType_t
{
kDown,
kUp
} ActionType_t;
};
EvtKey( intf_thread_t *pIntf, int key, ActionType_t action,
int mod = kModNone ):

8
modules/gui/skins2/events/evt_mouse.hpp

@ -32,19 +32,19 @@
class EvtMouse: public EvtInput
{
public:
typedef enum
enum ButtonType_t
{
kLeft,
kMiddle,
kRight
} ButtonType_t;
};
typedef enum
enum ActionType_t
{
kDown,
kUp,
kDblClick
} ActionType_t;
};
EvtMouse( intf_thread_t *pIntf, int xPos, int yPos, ButtonType_t button,
ActionType_t action, int mod = kModNone ):

4
modules/gui/skins2/events/evt_scroll.hpp

@ -32,11 +32,11 @@
class EvtScroll: public EvtInput
{
public:
typedef enum
enum Direction_t
{
kUp,
kDown
} Direction_t;
};
EvtScroll( intf_thread_t *pIntf, int xPos, int yPos,
Direction_t direction, int mod = kModNone ):

4
modules/gui/skins2/events/evt_special.hpp

@ -32,13 +32,13 @@
class EvtSpecial: public EvtGeneric
{
public:
typedef enum
enum ActionType_t
{
kShow,
kHide,
kEnable,
kDisable
} ActionType_t;
};
EvtSpecial( intf_thread_t *pIntf, ActionType_t action ):
EvtGeneric( pIntf ), m_action( action ) {}

4
modules/gui/skins2/src/dialogs.hpp

@ -97,12 +97,12 @@ class Dialogs: public SkinObject
typedef void DlgCallback( intf_dialog_args_t *pArg );
/// Possible flags for the open/save dialog
typedef enum
enum flags_t
{
kOPEN = 0x01,
kSAVE = 0x02,
kMULTIPLE = 0x04
} flags_t;
};
/// Initialization method
bool init();

4
modules/gui/skins2/src/os_factory.hpp

@ -44,14 +44,14 @@ class OSTimer;
class OSFactory: public SkinObject
{
public:
typedef enum
enum CursorType_t
{
kDefaultArrow,
kResizeNS,
kResizeWE,
kResizeNWSE,
kResizeNESW
} CursorType_t;
};
/// Initialization method overloaded in derived classes.
/// It must return false if the init failed.

4
modules/gui/skins2/utils/bezier.hpp

@ -38,12 +38,12 @@ class Bezier: public SkinObject
public:
/// Values to indicate which coordinate(s) must be checked to consider
/// that two points are distinct
typedef enum
enum Flag_t
{
kCoordsBoth, // x or y must be different (default)
kCoordsX, // only x is different
kCoordsY // only y is different
} Flag_t;
};
Bezier( intf_thread_t *p_intf,
const vector<float> &pAbscissas,

4
modules/gui/skins2/utils/position.hpp

@ -68,7 +68,7 @@ class Position
{
public:
/// Type for reference edge/corner
typedef enum
enum Ref_t
{
/// Coordinates are relative to the upper left corner
kLeftTop,
@ -78,7 +78,7 @@ class Position
kLeftBottom,
/// Coordinates are relative to the lower right corner
kRightBottom
} Ref_t;
};
/// Create a new position relative to the given box
Position( int left, int top, int right, int bottom, const Box &rBox,

Loading…
Cancel
Save