diff --git a/panda/src/display/graphicsPipe.I b/panda/src/display/graphicsPipe.I
index cfa5d6fc48..72d67f1925 100644
--- a/panda/src/display/graphicsPipe.I
+++ b/panda/src/display/graphicsPipe.I
@@ -55,7 +55,7 @@ supports_fullscreen() const {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsPipe::get_display_width
-//       Access: Public
+//       Access: Published
 //  Description: Returns the width of the entire display, if it is
 //               known.  This may return 0.  This is not a guarantee
 //               that windows (particularly fullscreen windows) may
@@ -69,7 +69,7 @@ get_display_width() const {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsPipe::get_display_height
-//       Access: Public
+//       Access: Published
 //  Description: Returns the height of the entire display, if it is
 //               known.  This may return 0.  See the caveats for
 //               get_display_width().
diff --git a/panda/src/display/graphicsPipe.cxx b/panda/src/display/graphicsPipe.cxx
index 3aca7c8442..1b221132a4 100644
--- a/panda/src/display/graphicsPipe.cxx
+++ b/panda/src/display/graphicsPipe.cxx
@@ -104,14 +104,14 @@ get_hw_channel(GraphicsWindow *, int) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsPipe::make_device
-//       Access: Protected, Virtual
+//       Access: Public, Virtual
 //  Description: Creates a new device for the pipe. Only DirectX uses
 //               this device, for other api's it is NULL.
 ////////////////////////////////////////////////////////////////////
 PT(GraphicsDevice) GraphicsPipe::
 make_device(void *scrn) {
-  // shouldnt this method really be pure virtual?  it's an error for a pipe to not implement it
-  display_cat.error() << "Error: make_device() unimplemented by graphicsPipe!\n";
+  display_cat.error() 
+    << "Error: make_device() unimplemented by graphicsPipe!\n";
   return NULL;
 }
 
diff --git a/panda/src/display/graphicsPipe.h b/panda/src/display/graphicsPipe.h
index 743db1831e..448d6a44b2 100644
--- a/panda/src/display/graphicsPipe.h
+++ b/panda/src/display/graphicsPipe.h
@@ -76,6 +76,9 @@ public:
   virtual int get_num_hw_channels();
   virtual HardwareChannel *get_hw_channel(GraphicsWindow *window, int index);
 
+  INLINE GraphicsDevice *get_device() const;
+  virtual PT(GraphicsDevice) make_device(void *scrn = NULL);
+
 protected:
   // The make_window() and make_gsg() interfaces on GraphicsPipe are
   // protected; don't try to call them directly.  Instead, use
@@ -94,8 +97,6 @@ protected:
 
 public:
 
-  virtual PT(GraphicsDevice) make_device(void *scrn = NULL);
-
   static TypeHandle get_class_type() {
     return _type_handle;
   }
@@ -108,7 +109,6 @@ public:
     return get_class_type();
   }
   virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
-  INLINE GraphicsDevice *get_device() const;
 
 private:
   static TypeHandle _type_handle;