David Rose 16 years ago
parent
commit
7ab86daba6

+ 3 - 3
panda/src/display/nativeWindowHandle.h

@@ -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;

+ 0 - 1
panda/src/windisplay/config_windisplay.cxx

@@ -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();
 }
 }

+ 0 - 1
panda/src/windisplay/winGraphicsPipe.cxx

@@ -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
 
 

+ 2 - 2
panda/src/windisplay/winGraphicsWindow.cxx

@@ -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();
       }
       }
     }
     }