diff options
Diffstat (limited to 'Public/Developer/SystemLib')
| -rw-r--r-- | Public/Developer/SystemLib/Headers/Dialog.h | 4 | ||||
| -rw-r--r-- | Public/Developer/SystemLib/Headers/Window.h | 20 |
2 files changed, 5 insertions, 19 deletions
diff --git a/Public/Developer/SystemLib/Headers/Dialog.h b/Public/Developer/SystemLib/Headers/Dialog.h index 0c0e4dbc..872eae5d 100644 --- a/Public/Developer/SystemLib/Headers/Dialog.h +++ b/Public/Developer/SystemLib/Headers/Dialog.h @@ -12,7 +12,7 @@ struct _DialogPort; struct _DialogPoint; /// @brief Dialog procedure type. -typedef VoidType(*WmDialogProc)(struct _DialogPort* port, UInt32Type msg, UIntPtrType pParam, UIntPtrType iParam); +typedef VoidType(*WmDialogFn)(struct _DialogPort* port, UInt32Type msg, UIntPtrType pParam, UIntPtrType iParam); /// @brief A point, can represent the size, position of a window. typedef struct _DialogPoint { @@ -25,7 +25,7 @@ typedef struct _DialogPort { BooleanType dlgVisible; BooleanType dlgMoving; DialogPoint dlgPosition; - WmDialogProc dlgProc; + WmDialogFn dlgProc; struct _WindowPort* parentPort; } DialogPort; diff --git a/Public/Developer/SystemLib/Headers/Window.h b/Public/Developer/SystemLib/Headers/Window.h index 58b10d8e..ad626e2e 100644 --- a/Public/Developer/SystemLib/Headers/Window.h +++ b/Public/Developer/SystemLib/Headers/Window.h @@ -27,7 +27,7 @@ struct _WmPoint; typedef QWordType DCRef; /// @brief Window procedure type. -typedef VoidType(*WmWindowProc)(struct _WindowPort* port, UInt32Type msg, UIntPtrType pParam, UIntPtrType iParam); +typedef VoidType(*WmWindowFn)(struct _WindowPort* port, UInt32Type msg, UIntPtrType pParam, UIntPtrType iParam); /// @brief A point, can represent the size, position of a window. typedef struct _WmPoint { @@ -48,7 +48,7 @@ typedef struct _WindowPort { WmPoint windowSize; BooleanType windowInvalidate; DWordType windowClearColor; - WmWindowProc windowProc; + WmWindowFn windowProc; struct _WindowPort* windowMenuPort; ///! Attached menu to it. struct _WindowPort* windowParentPort; } WindowPort; @@ -60,7 +60,7 @@ typedef struct _ControlPort { BooleanType controlVisible; BooleanType controlMoving; WmPoint controlPosition; - WmWindowProc controlProc; + WmWindowFn controlProc; WindowPort* parentPort; } ControlPort; @@ -156,17 +156,3 @@ CA_EXTERN_C VoidType WmReleaseMenu(WindowPort* port); /// @param where to move. /// @return error code. CA_EXTERN_C Int32Type WmMoveWindow(WindowPort* id, WmPoint where); - -/// @brief Get last message. -/// @param id -/// @return -CA_EXTERN_C Int64Type WmGetMessage(WindowPort* id); - -/// @brief Translate message internally. -/// @return -CA_EXTERN_C VoidType WmTranslateMessage(WindowPort* port, Int64Type msg); - -/// @brief Dispatch message to event queue. -/// @param id -/// @return -CA_EXTERN_C Int32Type WmDispatchMessage(WindowPort* id); |
