TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
David Rose 2009-10-01 00:42:34 +00:00
parent 366d56a74b
commit 7ab86daba6
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/display/nativeWindowHandle.h
View File

@ -60,7 +60,7 @@ public:
#endif // WIN32 #endif // WIN32
public: public:
class IntHandle : public OSHandle { class EXPCL_PANDA_DISPLAY IntHandle : public OSHandle {
public: public:
INLINE IntHandle(size_t handle); INLINE IntHandle(size_t handle);
virtual size_t get_int_handle() const; virtual size_t get_int_handle() const;
@ -89,7 +89,7 @@ public:
static TypeHandle _type_handle; static TypeHandle _type_handle;
}; };
class SubprocessHandle : public OSHandle { class EXPCL_PANDA_DISPLAY SubprocessHandle : public OSHandle {
public: public:
INLINE SubprocessHandle(const Filename &filename); INLINE SubprocessHandle(const Filename &filename);
virtual void output(ostream &out) const; virtual void output(ostream &out) const;
@ -118,7 +118,7 @@ public:
}; };
#if defined(HAVE_X11) && !defined(CPPPARSER) #if defined(HAVE_X11) && !defined(CPPPARSER)
class X11Handle : public OSHandle { class EXPCL_PANDA_DISPLAY X11Handle : public OSHandle {
public: public:
INLINE X11Handle(Window handle); INLINE X11Handle(Window handle);
virtual size_t get_int_handle() const; virtual size_t get_int_handle() const;

1
panda/src/windisplay/config_windisplay.cxx
View File

@ -77,6 +77,5 @@ init_libwindisplay() {
initialized = true; initialized = true;
WinGraphicsPipe::init_type(); WinGraphicsPipe::init_type();
WinGraphicsPipe::WinHandle::init_type();
WinGraphicsWindow::init_type(); WinGraphicsWindow::init_type();
} }

1
panda/src/windisplay/winGraphicsPipe.cxx
View File

@ -27,7 +27,6 @@
TypeHandle WinGraphicsPipe::_type_handle; TypeHandle WinGraphicsPipe::_type_handle;
TypeHandle WinGraphicsPipe::WinHandle::_type_handle;
#define MAXIMUM_PROCESSORS 32 #define MAXIMUM_PROCESSORS 32

4
panda/src/windisplay/winGraphicsWindow.cxx
View File

@ -880,10 +880,10 @@ open_regular_window() {
<< "os_handle type " << os_handle->get_type() << "\n"; << "os_handle type " << os_handle->get_type() << "\n";
if (os_handle->is_of_type(NativeWindowHandle::WinHandle::get_class_type())) { if (os_handle->is_of_type(NativeWindowHandle::WinHandle::get_class_type())) {
WinGraphicsPipe::WinHandle *win_handle = DCAST(NativeWindowHandle::WinHandle, os_handle); NativeWindowHandle::WinHandle *win_handle = DCAST(NativeWindowHandle::WinHandle, os_handle);
_hparent = win_handle->get_handle(); _hparent = win_handle->get_handle();
} else if (os_handle->is_of_type(NativeWindowHandle::IntHandle::get_class_type())) { } else if (os_handle->is_of_type(NativeWindowHandle::IntHandle::get_class_type())) {
WindowHandle::IntHandle *int_handle = DCAST(NativeWindowHandle::IntHandle, os_handle); NativeWindowHandle::IntHandle *int_handle = DCAST(NativeWindowHandle::IntHandle, os_handle);
_hparent = (HWND)int_handle->get_handle(); _hparent = (HWND)int_handle->get_handle();
} }
} }