Old API deprecated. Source cleaning.

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 6ddf2d4c5bedd36bf12fda942174e8668b2a9b25..cdb8b5e95384548ff6f8006472dbfbf6ac47bf83 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -33,19 +33,6 @@ class WXDLLEXPORT wxWindow;
 // private constants
 // ---------------------------------------------------------------------------
 
 // private constants
 // ---------------------------------------------------------------------------
 

-// Conversion
-static const double METRIC_CONVERSION_CONSTANT = 0.0393700787;
-
-// Scaling factors for various unit conversions
-static const double mm2inches = (METRIC_CONVERSION_CONSTANT);
-static const double inches2mm = (1/METRIC_CONVERSION_CONSTANT);
-
-static const double mm2twips = (METRIC_CONVERSION_CONSTANT*1440);
-static const double twips2mm = (1/(METRIC_CONVERSION_CONSTANT*1440));
-
-static const double mm2pt = (METRIC_CONVERSION_CONSTANT*72);
-static const double pt2mm = (1/(METRIC_CONVERSION_CONSTANT*72));
-

 // 260 was taken from windef.h
 #ifndef MAX_PATH
     #define MAX_PATH  260
 // 260 was taken from windef.h
 #ifndef MAX_PATH
     #define MAX_PATH  260


@@ -532,13 +519,13 @@ extern "C"
 
 WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
 
 
 WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
 

-// return the full name of the program file
-inline wxString wxGetFullModuleName()
+// return the full path of the given module
+inline wxString wxGetFullModuleName(HMODULE hmod)

 {
     wxString fullname;
     if ( !::GetModuleFileName
             (
 {
     wxString fullname;
     if ( !::GetModuleFileName
             (

-                (HMODULE)wxGetInstance(),
+                hmod,

                 wxStringBuffer(fullname, MAX_PATH),
                 MAX_PATH
             ) )
                 wxStringBuffer(fullname, MAX_PATH),
                 MAX_PATH
             ) )


@@ -549,6 +536,12 @@ inline wxString wxGetFullModuleName()
     return fullname;
 }
 
     return fullname;
 }
 

+// return the full path of the program file
+inline wxString wxGetFullModuleName()
+{
+    return wxGetFullModuleName((HMODULE)wxGetInstance());
+}
+

 #if wxUSE_GUI
 
 // cursor stuff
 #if wxUSE_GUI
 
 // cursor stuff