X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c978d36124197b5612a2cabefed7591ad0eea6e2..37c7aad682194ccd67876550aa33aa6dc27dde7f:/include/wx/x11/reparent.h diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h index 8170084a19..b98f70c918 100644 --- a/include/wx/x11/reparent.h +++ b/include/wx/x11/reparent.h @@ -12,7 +12,7 @@ #ifndef _WX_REPARENT_H_ #define _WX_REPARENT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "reparent.h" #endif @@ -63,8 +63,8 @@ class wxAdoptedWindow: public wxWindow wxAdoptedWindow(WXWindow window); ~wxAdoptedWindow(); - void SetHandle(WXWindow window) { m_mainWidget = window; } - WXWindow GetHandle() const { return GetXWindow(); } + void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; } + WXWindow GetHandle() const { return GetMainWindow(); } }; #endif