Use "_x64" instead of "amd64" for x64 MSW makefile builds.

[wxWidgets.git] / include / wx / nativewin.h

diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h
index 3aa6ffc79055f41aa3c73b1e634437d9c0d78080..6571149755ff7a16d3ce1af89e1793bf723917d2 100644 (file)
--- a/include/wx/nativewin.h
+++ b/include/wx/nativewin.h
@@ -39,9 +39,7 @@
     typedef HWND wxNativeContainerWindowId;
     typedef HWND wxNativeContainerWindowHandle;
 #elif defined(__WXGTK__)
-    #include <gdk/gdk.h>
-
-    typedef GdkNativeWindow wxNativeContainerWindowId;
+    typedef unsigned long wxNativeContainerWindowId;
     typedef GdkWindow *wxNativeContainerWindowHandle;
 #else
     // no support for using native windows under this platform yet
@@ -145,6 +143,9 @@ public:
         return false;
     }
 
+#ifdef __WXMSW__
+    virtual bool IsShown() const;
+#endif // __WXMSW__
 
     // this is an implementation detail: called when the native window is
     // destroyed by an outside agency; deletes the C++ object too but can in
@@ -152,8 +153,14 @@ public:
     // handle of this object and all of its children is invalid any more)
     virtual void OnNativeDestroyed();
 
+protected:
+#ifdef __WXMSW__
+    virtual WXLRESULT
+    MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif // __WXMSW__
+
 private:
-    DECLARE_NO_COPY_CLASS(wxNativeContainerWindow)
+    wxDECLARE_NO_COPY_CLASS(wxNativeContainerWindow);
 };
 
 #endif // wxHAS_NATIVE_CONTAINER_WINDOW