Kaydet (Commit) 91689527 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Clean up misguided use of EMPTYARG

Change-Id: Ib0ea9b16c3107f1d6d4ab148adcf26a5372f9417
üst 9bb254fc
...@@ -4232,12 +4232,7 @@ static bool checkSingleKeyCommitHack( guint keyval, sal_Unicode cCode ) ...@@ -4232,12 +4232,7 @@ static bool checkSingleKeyCommitHack( guint keyval, sal_Unicode cCode )
return bRet; return bRet;
} }
#ifdef SOLARIS void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* pContext, gchar* pText, gpointer im_handler )
#define CONTEXT_ARG pContext
#else
#define CONTEXT_ARG EMPTYARG
#endif
void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* pText, gpointer im_handler )
{ {
GtkSalFrame::IMHandler* pThis = static_cast<GtkSalFrame::IMHandler*>(im_handler); GtkSalFrame::IMHandler* pThis = static_cast<GtkSalFrame::IMHandler*>(im_handler);
...@@ -4298,13 +4293,15 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p ...@@ -4298,13 +4293,15 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p
pThis->updateIMSpotLocation(); pThis->updateIMSpotLocation();
} }
} }
#ifdef SOLARIS #ifdef SOLARIS
// #i51356# workaround a solaris IIIMP bug // #i51356# workaround a solaris IIIMP bug
// in case of partial commits the preedit changed signal // in case of partial commits the preedit changed signal
// and commit signal come in wrong order // and commit signal come in wrong order
if( ! aDel.isDeleted() ) if( ! aDel.isDeleted() )
signalIMPreeditChanged( pContext, im_handler ); signalIMPreeditChanged( pContext, im_handler );
#endif #else
(void) pContext;
#endif
} }
void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_handler ) void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_handler )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment