Browse Source

Fix compile errors for 64-bits windows

rdb 16 years ago
parent
commit
e2c01a284f

+ 1 - 1
pandatool/src/maxegg/maxEgg.cxx

@@ -303,7 +303,7 @@ IObjParam *MaxEggPlugin::iObjParams;
    dialog box that appears at the beginning of the conversion process.
    dialog box that appears at the beginning of the conversion process.
  */
  */
 
 
-BOOL CALLBACK MaxEggPluginOptionsDlgProc( HWND hWnd, UINT message, 
+INT_PTR CALLBACK MaxEggPluginOptionsDlgProc( HWND hWnd, UINT message, 
                                           WPARAM wParam, LPARAM lParam ) 
                                           WPARAM wParam, LPARAM lParam ) 
 {
 {
   MaxOptionsDialog *tempEgg;
   MaxOptionsDialog *tempEgg;

+ 1 - 1
pandatool/src/maxegg/maxOptionsDialog.cxx

@@ -241,7 +241,7 @@ MaxEggOptions::MaxEggOptions() {
     _successful = false;
     _successful = false;
 }
 }
 
 
-BOOL CALLBACK MaxOptionsDialogProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) 
+INT_PTR CALLBACK MaxOptionsDialogProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) 
 {
 {
     char tempFilename[2048];
     char tempFilename[2048];
     //We pass in our plugin through the lParam variable. Let's convert it back.
     //We pass in our plugin through the lParam variable. Let's convert it back.

+ 1 - 1
pandatool/src/maxegg/maxOptionsDialog.h

@@ -41,7 +41,7 @@ char *ChunkLoadString(ILoad *iload, char *buffer, int maxBytes);
 int ChunkLoadInt(ILoad *iload);
 int ChunkLoadInt(ILoad *iload);
 bool ChunkLoadBool(ILoad *iload);
 bool ChunkLoadBool(ILoad *iload);
 void SetICustEdit(HWND wnd, int nIDDlgItem, char *text);
 void SetICustEdit(HWND wnd, int nIDDlgItem, char *text);
-BOOL CALLBACK MaxOptionsDialogProc( HWND hWnd, UINT message, 
+INT_PTR CALLBACK MaxOptionsDialogProc( HWND hWnd, UINT message, 
                                     WPARAM wParam, LPARAM lParam );
                                     WPARAM wParam, LPARAM lParam );
 
 
 struct MaxEggOptions
 struct MaxEggOptions

+ 2 - 2
pandatool/src/maxprogs/maxEggImport.cxx

@@ -124,7 +124,7 @@ unsigned int MaxEggImporter::Version()
   return 100;
   return 100;
 }
 }
 
 
-static BOOL CALLBACK AboutBoxDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK AboutBoxDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 {
   switch (msg) {
   switch (msg) {
   case WM_INITDIALOG:
   case WM_INITDIALOG:
@@ -150,7 +150,7 @@ void MaxEggImporter::ShowAbout(HWND hWnd)
 }
 }
 
 
 
 
-static BOOL CALLBACK ImportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK ImportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 {
   MaxEggImporter *imp = (MaxEggImporter*)GetWindowLong(hWnd,GWL_USERDATA); 
   MaxEggImporter *imp = (MaxEggImporter*)GetWindowLong(hWnd,GWL_USERDATA); 
   switch (msg) {
   switch (msg) {