From eb78f7cd0de362bd87e81795a9140644a32c655f Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 31 Oct 2011 14:06:49 +0000
Subject: [PATCH] Another pass at fixing Pmw

---
 direct/src/p3d/panda3d.pdef    | 6 +++---
 direct/src/p3d/thirdparty.pdef | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef
index ed50ccfac9..08ca6de602 100755
--- a/direct/src/p3d/panda3d.pdef
+++ b/direct/src/p3d/panda3d.pdef
@@ -80,10 +80,10 @@ class panda3d(package):
     excludeModule('wx',
                   'direct.showbase.WxGlobal')
 
-    excludeModule('Tkinter',
+    excludeModule('Tkinter', 'Pmw',
                   'direct.showbase.TkGlobal',
-                  'direct.tkpanels',
-                  'direct.tkwidgets')
+                  'direct.tkpanels', 'direct.tkwidgets',
+                  'tkCommonDialog', 'tkMessageBox', 'tkSimpleDialog')
 
     # Most of the core Panda3D DLL's will be included implicitly due to
     # being referenced by the above Python code.  Here we name a few more
diff --git a/direct/src/p3d/thirdparty.pdef b/direct/src/p3d/thirdparty.pdef
index a39ac88697..a09aee9b89 100644
--- a/direct/src/p3d/thirdparty.pdef
+++ b/direct/src/p3d/thirdparty.pdef
@@ -37,8 +37,8 @@ class tk(package):
     module('direct.showbase.TkGlobal',
            'direct.tkpanels',
            'direct.tkwidgets',
-           'Pmw', 'Pmw.Pmw_1_2.lib.PmwLoader',
-                  'Pmw.Pmw_1_3.lib.PmwLoader')
+           'Pmw', 'Pmw.Pmw_1_2.lib.*',
+                  'Pmw.Pmw_1_3.lib.*')
 
 class sqlite(package):
     config(display_name = "SQLite Interface")