editor: reduce hinstance getting

Store hInstance in a global variable instead of getting it over and
over again.
This commit is contained in:
Erik Faye-Lund 2010-04-20 19:52:44 +02:00
parent a56dc45690
commit 87e5f0d421

View File

@ -29,6 +29,7 @@ const char *mainWindowTitle = "GNU Rocket System";
const wchar_t *mainWindowTitleW = L"GNU Rocket System"; const wchar_t *mainWindowTitleW = L"GNU Rocket System";
const char *keyName = "SOFTWARE\\GNU Rocket"; const char *keyName = "SOFTWARE\\GNU Rocket";
HINSTANCE hInstance;
HWND hwnd = NULL; HWND hwnd = NULL;
TrackView *trackView = NULL; TrackView *trackView = NULL;
HWND trackViewWin = NULL; HWND trackViewWin = NULL;
@ -282,7 +283,6 @@ static LRESULT CALLBACK mainWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
{ {
case WM_CREATE: case WM_CREATE:
{ {
HINSTANCE hInstance = GetModuleHandle(NULL);
trackViewWin = trackView->create(hInstance, hwnd); trackViewWin = trackView->create(hInstance, hwnd);
InitCommonControls(); InitCommonControls();
statusBarWin = CreateWindowEx( statusBarWin = CreateWindowEx(
@ -419,7 +419,6 @@ static LRESULT CALLBACK mainWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
case ID_EDIT_SETROWS: case ID_EDIT_SETROWS:
{ {
HINSTANCE hInstance = GetModuleHandle(NULL);
int rows = int(trackView->getRows()); int rows = int(trackView->getRows());
INT_PTR result = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_SETROWS), hwnd, (DLGPROC)setRowsDialogProc, (LPARAM)&rows); INT_PTR result = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_SETROWS), hwnd, (DLGPROC)setRowsDialogProc, (LPARAM)&rows);
if (FAILED(result)) MessageBox(hwnd, "unable to create dialog box", mainWindowTitle, MB_OK | MB_ICONERROR | MB_SETFOREGROUND); if (FAILED(result)) MessageBox(hwnd, "unable to create dialog box", mainWindowTitle, MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
@ -428,7 +427,6 @@ static LRESULT CALLBACK mainWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
case ID_EDIT_BIAS: case ID_EDIT_BIAS:
{ {
HINSTANCE hInstance = GetModuleHandle(NULL);
int initialBias = 0; int initialBias = 0;
INT_PTR result = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_BIASSELECTION), hwnd, (DLGPROC)biasSelectionDialogProc, (LPARAM)&initialBias); INT_PTR result = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_BIASSELECTION), hwnd, (DLGPROC)biasSelectionDialogProc, (LPARAM)&initialBias);
if (FAILED(result)) MessageBox(hwnd, "unable to create dialog box", mainWindowTitle, MB_OK | MB_ICONERROR | MB_SETFOREGROUND); if (FAILED(result)) MessageBox(hwnd, "unable to create dialog box", mainWindowTitle, MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
@ -541,7 +539,7 @@ int main(int argc, char* argv[])
// _CrtSetBreakAlloc(254); // _CrtSetBreakAlloc(254);
#endif #endif
HINSTANCE hInstance = GetModuleHandle(NULL); hInstance = GetModuleHandle(NULL);
CoInitialize(NULL); CoInitialize(NULL);
#if 0 #if 0