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

oh, there's another occurrence of InitCustomControls here

Browse Source
This commit is contained in:
rdb 2011-09-01 09:09:09 +00:00
parent 356c7de5f2
commit 8696f5c3fe
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandatool/src/maxprogs/maxEggImport.cxx
View File

@ -181,8 +181,7 @@ static INT_PTR CALLBACK ImportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
return TRUE; return TRUE;
} }
int MaxEggImporter::DoImport(const TCHAR *name,ImpInterface *ii,Interface *i, BOOL suppressPrompts) int MaxEggImporter::DoImport(const TCHAR *name,ImpInterface *ii,Interface *i, BOOL suppressPrompts) {
{
// Prompt the user with our dialogbox. // Prompt the user with our dialogbox.
if (!DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_IMPORT_DLG), if (!DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_IMPORT_DLG),
i->GetMAXHWnd(), ImportDlgProc, (LPARAM)this)) { i->GetMAXHWnd(), ImportDlgProc, (LPARAM)this)) {
@ -193,8 +192,9 @@ int MaxEggImporter::DoImport(const TCHAR *name,ImpInterface *ii,Interface *i, BO
Notify::ptr()->set_ostream_ptr(&log, false); Notify::ptr()->set_ostream_ptr(&log, false);
bool ok = MaxLoadEggFile(name, _merge ? true:false, _importmodel ? true:false, _importanim ? true:false); bool ok = MaxLoadEggFile(name, _merge ? true:false, _importmodel ? true:false, _importanim ? true:false);
string txt = log.str(); string txt = log.str();
if (txt != "") MessageBox(NULL, txt.c_str(), "Panda3D Importer", MB_OK); if (txt != "") {
else { MessageBox(NULL, txt.c_str(), "Panda3D Importer", MB_OK);
} else {
if (!ok) MessageBox(NULL, "Import Failed, unknown reason\n", "Panda3D Importer", MB_OK); if (!ok) MessageBox(NULL, "Import Failed, unknown reason\n", "Panda3D Importer", MB_OK);
} }
Notify::ptr()->set_ostream_ptr(NULL, false); Notify::ptr()->set_ostream_ptr(NULL, false);
@ -213,14 +213,18 @@ int MaxEggImporter::DoImport(const TCHAR *name,ImpInterface *ii,Interface *i, BO
HINSTANCE hInstance; HINSTANCE hInstance;
BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) {
{
static int controlsInit = FALSE; static int controlsInit = FALSE;
hInstance = hinstDLL; hInstance = hinstDLL;
if (!controlsInit) { if (!controlsInit) {
controlsInit = TRUE; controlsInit = TRUE;
// It appears that InitCustomControls is deprecated in 2012.
// I'm not sure if we can just remove it like this, but
// I've heard that it seems to work, so let's do it like this.
#if MAX_VERSION_MAJOR < 14
InitCustomControls(hInstance); InitCustomControls(hInstance);
#endif
InitCommonControls(); InitCommonControls();
} }
@ -230,8 +234,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
#define PANDAEGGIMP_CLASS_ID1 0x377193ab #define PANDAEGGIMP_CLASS_ID1 0x377193ab
#define PANDAEGGIMP_CLASS_ID2 0x897afe12 #define PANDAEGGIMP_CLASS_ID2 0x897afe12
class MaxEggImporterClassDesc: public ClassDesc class MaxEggImporterClassDesc: public ClassDesc {
{
public: public:
int IsPublic() {return 1;} int IsPublic() {return 1;}
void *Create(BOOL loading = FALSE) {return new MaxEggImporter;} void *Create(BOOL loading = FALSE) {return new MaxEggImporter;}