Skip to content

Commit

Permalink
Remove some inline definitions
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentWei committed Oct 24, 2017
1 parent 0d97ccc commit edb1955
Show file tree
Hide file tree
Showing 9 changed files with 496 additions and 485 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_definitions (-D_GNU_SOURCE)
# the version number.
set (MINIGUI_MAJOR_VERSION 3)
set (MINIGUI_MINOR_VERSION 2)
set (MINIGUI_MICRO_VERSION 1)
set (MINIGUI_MICRO_VERSION 2)

set (MINIGUI_NAME "minigui")
set (MGLIB_SUFFIX "")
Expand Down
11 changes: 9 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
*******************************************************************************
What's new in trunk:
What's new (V3.2.2):
10/24-2017
CLEANUP: Remove some 'inline' definitions:
* GetIMEPos/SetIMEPos.
* WndRect -> gui_WndRect.
* WndClientRect -> gui_WndClientRect.

*******************************************************************************
What's new (V3.2.1):

12/06. CLEANUP #11: Merge differences from rel-3-0, and remove unnecessary
files. svn merge -r 12913:13673 ../branches/rel-3-0 (wanzheng)
Expand All @@ -18,7 +26,6 @@ rel-3.0(dongjunjie)
* src/textedit/mtextedit.c
* src/textedit/mtextedit.h


06/30. BUGFIXING: #4801 Fix a bug which introduce a absolute path check error
in Windows (dongkai).
* src/font/devfont.c
Expand Down
2 changes: 1 addition & 1 deletion Version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Version 3.2.1 (the developing version of the official version 3.2)
Version 3.2.2 (the official release)

This release needs the following resource packages:

Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ(2.52)

dnl ========================================================================
dnl Put the name and version of the package here
AC_INIT([libminigui], [3.2.1])
AC_INIT([libminigui], [3.2.2])
AC_CONFIG_SRCDIR([src/main/main.c])

dnl Set various version strings - taken gratefully from the SDL sources
Expand Down
40 changes: 22 additions & 18 deletions include/window.h
Original file line number Diff line number Diff line change
Expand Up @@ -7815,22 +7815,6 @@ MG_EXPORT int GUIAPI SetIMEStatus (int StatusCode, int Value);
*/
MG_EXPORT int GUIAPI GetIMETargetInfo (IME_TARGET_INFO *info);

/**
* \fn int GUIAPI GetIMEPos (POINT* pt)
* \brief Retrives the position of the current IME window.
*
* This function retrives the position of the current IME window.
*
* \param pt The item to be retrived. The positon is
* return by the current IME Window.
*
* \return The current IME window positon.
* ERR_IME_NOIMEWND if error occurred.
*
* \sa GetIMEPos
*/
MG_EXPORT inline int GUIAPI GetIMEPos (POINT* pt);

/**
* \fn int GUIAPI SetIMETargetInfo (const IME_TARGET_INFO *info)
* \brief Sets the target info of the current IME window.
Expand All @@ -7849,9 +7833,29 @@ MG_EXPORT inline int GUIAPI GetIMEPos (POINT* pt);
MG_EXPORT int GUIAPI SetIMETargetInfo (const IME_TARGET_INFO *info);

/**
* \fn inline int GUIAPI SetIMEPos (POINT* pt)
* \fn int GUIAPI GetIMEPos (POINT* pt)
* \brief Retrives the position of the current IME window.
*
* NOTE that this function is deprecated.
*
* This function retrives the position of the current IME window.
*
* \param pt The item to be retrived. The positon is
* return by the current IME Window.
*
* \return The current IME window positon.
* ERR_IME_NOIMEWND if error occurred.
*
* \sa GetIMEPos
*/
MG_EXPORT int GUIAPI GetIMEPos (POINT* pt);

/**
* \fn int GUIAPI SetIMEPos (POINT* pt)
* \brief Sets the position of the current IME window.
*
* NOTE that this function is deprecated.
*
* This function sets the position of the current IME window.
*
* \param pt The set position value.
Expand All @@ -7863,7 +7867,7 @@ MG_EXPORT int GUIAPI SetIMETargetInfo (const IME_TARGET_INFO *info);
*
* \sa SetIMEPos
*/
MG_EXPORT inline int GUIAPI SetIMEPos(const POINT* pt);
MG_EXPORT int GUIAPI SetIMEPos (const POINT* pt);

/** @} end of ime_fns */

Expand Down
Loading

0 comments on commit edb1955

Please sign in to comment.