Commit a4f6c1c1 authored by Ken Herbert's avatar Ken Herbert
Browse files

Update to v2.0.2

parent 3414adf3
# Project: PCNameGrabber
# Compiler: Default GCC compiler
# Compiler Type: MingW 3
# Makefile created by wxDev-C++ IDE 7.4.2.569 on 28/10/12 17:37
WXLIBNAME = wxmsw29u
CPP = g++.exe
CC = gcc.exe
WINDRES = "windres.exe"
OBJ = Objects/MingW/main.o Objects/MingW/PCNameGrabber_private.res
LINKOBJ = "Objects/MingW/main.o" Objects/MingW/PCNameGrabber_private.res
LIBS = -L"D:/PortableApps/wxDev-CppPortable/App/Dev-Cpp/lib/wx/gcc_lib" -L"D:/PortableApps/wxDev-CppPortable/App/Dev-Cpp/lib" -L"D:/PortableApps/wxDev-CppPortable/App/Dev-Cpp/MinGW32/lib" -mwindows -lwsock32 -g3
INCS = -I"D:/PortableApps/wxDev-CppPortable/App/Dev-Cpp/MinGW32/include"
CXXINCS = -I"D:/PortableApps/wxDev-CppPortable/App/Dev-Cpp/MinGW32/include" -I"D:/PortableApps/wxDev-CppPortable/App/Dev-Cpp/" -I"D:/PortableApps/wxDev-CppPortable/App/Dev-Cpp/include/common"
RCINCS = --include-dir "D:/PORTAB~1/WXDEV-~1/App/Dev-Cpp/include/common"
BIN = Output/MingW/PCNameGrabber.exe
DEFINES =
CXXFLAGS = $(CXXINCS) $(DEFINES) -fexpensive-optimizations -O3 -g3
CFLAGS = $(INCS) $(DEFINES) -fexpensive-optimizations -O3 -g3
GPROF = gprof.exe
ifeq ($(OS),Windows_NT)
RM = del /Q
FixPath = $(subst /,\,$1)
else
RM = rm -f
FixPath = $1
endif
LINK = g++.exe
.PHONY: all all-before all-after clean clean-custom
all: all-before $(BIN) all-after
clean: clean-custom
$(RM) $(call FixPath,$(LINKOBJ)) "$(call FixPath,$(BIN))"
$(BIN): $(OBJ)
$(LINK) $(LINKOBJ) -o "$(BIN)" $(LIBS)
Objects/MingW/main.o: $(GLOBALDEPS) main.cpp resource.h
$(CPP) -c main.cpp -o Objects/MingW/main.o $(CXXFLAGS)
Objects/MingW/PCNameGrabber_private.res: Objects/MingW/PCNameGrabber_private.rc resource.rc
$(WINDRES) --input-format=rc -o Objects/MingW/PCNameGrabber_private.res $(RCINCS) Objects/MingW/PCNAME~1.RC -O coff
[Project]
FileName=PCNameGrabber.dev
Name=PCNameGrabber
UnitCount=3
PchHead=-1
PchSource=-1
Ver=3
IsCpp=1
ProfilesCount=2
ProfileIndex=0
Folders=
[Unit1]
FileName=main.cpp
CompileCpp=1
Folder=
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[VersionInfo]
Major=2
Minor=0
Release=2
Build=10
LanguageID=1033
CharsetID=1252
CompanyName=Firedancer Software
FileVersion=2.0.2
FileDescription=Dislays the name of the current PC
InternalName=PCNameGrabber
LegalCopyright=2012 Firedancer Software
LegalTrademarks=
OriginalFilename=PCNameGrabber.exe
ProductName=PC Name Grabber
ProductVersion=2.0.2
AutoIncBuildNrOnRebuild=0
AutoIncBuildNrOnCompile=1
UnitCount=3
[Profile1]
ProfileName=MingW gcc
Type=0
ObjFiles=
Includes=
Libs=
ResourceIncludes=
MakeIncludes=
Compiler=
CppCompiler=
Linker=-mwindows_@@_-lwsock32_@@_
PreprocDefines=
CompilerSettings=0000000001001001000000
Icon=
ExeOutput=Output\MingW
ImagesOutput=Images\
ObjectOutput=Objects\MingW
OverrideOutput=0
OverrideOutputName=PCNameGrabber.exe
HostApplication=
CommandLine=
UseCustomMakefile=0
CustomMakefile=
IncludeVersionInfo=1
SupportXPThemes=0
CompilerSet=0
CompilerType=0
[Profile2]
ProfileName=MS Visual C++
Type=0
ObjFiles=
Includes=
Libs=
ResourceIncludes=
MakeIncludes=
Compiler=
CppCompiler=
Linker=user32.lib_@@_
PreprocDefines=
CompilerSettings=000000000000010000000000000000000000
Icon=
ExeOutput=Output\Visual C++
ImagesOutput=Images\
ObjectOutput=Objects\Visual C++
OverrideOutput=0
OverrideOutputName=
HostApplication=
CommandLine=
UseCustomMakefile=0
CustomMakefile=
IncludeVersionInfo=0
SupportXPThemes=0
CompilerSet=9
CompilerType=9
[Unit2]
FileName=resource.h
CompileCpp=1
Folder=PCNameGrabber
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit3]
FileName=resource.rc
Folder=PCNameGrabber
Compile=1
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Editors]
Focused=0
Order=0
[Editor_0]
Open=1
Top=1
CursorCol=52
CursorRow=81
TopLine=67
LeftChar=1
[Editor_2]
CursorCol=1
CursorRow=1
TopLine=25
LeftChar=1
[Editor_1]
CursorCol=1
CursorRow=25
TopLine=12
LeftChar=1
......@@ -17,27 +17,93 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Email: firedancer.development@gmail.com
* Website: http://firedancer-software.tk
* Email: admin@firedancer-software.com
* Website: http://firedancer-software.com
*
*/
#include <winsock.h>
#include <windows.h>
#include "resource.h"
#include <stdio.h>
#include <commctrl.h>
/* Declare Windows procedure */
LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM);
/* Make the class name into a global variable */
char szClassName[ ] = "PCNameGrabber";
HFONT g_hfFont = NULL;
COLORREF g_rgbText = RGB(0, 0, 0);
COLORREF g_rgbBackground = RGB(255, 255, 255);
COLORREF g_rgbCustom[16] = {0};
bool bInit = false;
const char g_szClassName[] = "PCNameGrabber";
int WINAPI WinMain (HINSTANCE hThisInstance,
HINSTANCE hPrevInstance,
LPSTR lpszArgument,
int nFunsterStil)
bool bInit = false;
{
HWND hwnd; /* This is the handle for our window */
MSG messages; /* Here messages to the application are saved */
WNDCLASSEX wincl; /* Data structure for the windowclass */
/* The Window structure */
wincl.hInstance = hThisInstance;
wincl.lpszClassName = szClassName;
wincl.lpfnWndProc = WindowProcedure; /* This function is called by windows */
wincl.style = CS_DBLCLKS; /* Catch double-clicks */
wincl.cbSize = sizeof (WNDCLASSEX);
/* Use default icon and mouse-pointer */
wincl.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_APPICON));
wincl.hIconSm = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_APPICON), IMAGE_ICON, 16, 16, 0);
wincl.hCursor = LoadCursor (NULL, IDC_ARROW);
wincl.lpszMenuName = MAKEINTRESOURCE(IDR_APPMENU); /* No menu */
wincl.cbClsExtra = 0; /* No extra bytes after the window class */
wincl.cbWndExtra = 0; /* structure or the window instance */
/* Use Windows's default color as the background of the window */
wincl.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
/* Register the window class, and if it fails quit the program */
if (!RegisterClassEx (&wincl))
return 0;
/* The class is registered, let's create the program*/
hwnd = CreateWindowEx (
0, /* Extended possibilites for variation */
szClassName, /* Classname */
"PC Name Grabber", /* Title Text */
WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, /* default window */
CW_USEDEFAULT, /* Windows decides the position */
CW_USEDEFAULT, /* where the window ends up on the screen */
240, /* The programs width */
120, /* and height in pixels */
HWND_DESKTOP, /* The window is a child-window to desktop */
NULL, /* No menu */
hThisInstance, /* Program Instance handler */
NULL /* No Window Creation data */
);
/* Make the window visible on the screen */
ShowWindow (hwnd, nFunsterStil);
/* Run the message loop. It will run until GetMessage() returns 0 */
while (GetMessage (&messages, NULL, 0, 0))
{
/* Translate virtual-key messages into character messages */
TranslateMessage(&messages);
/* Send message to WindowProcedure */
DispatchMessage(&messages);
}
/* The program return-value is 0 - The value that PostQuitMessage() gave */
return messages.wParam;
}
BOOL CALLBACK AboutDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
......@@ -65,9 +131,11 @@ BOOL CALLBACK AboutDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam
}
LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
/* This function is called by the Windows function DispatchMessage() */
LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch(msg)
switch(message)
{
case WM_CREATE:
......@@ -89,7 +157,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
PostMessage(hwnd, WM_CLOSE, 0, 0);
break;
case ID_HELP_WEBSITE:
ShellExecute(NULL, "open", "http://firedancer-software.tk/", NULL, NULL, SW_SHOWNORMAL);
ShellExecute(NULL, "open", "http://firedancer-software.com/app.php?id=1", NULL, NULL, SW_SHOWNORMAL);
return 0;
break;
case ID_HELP_ABOUT:
......@@ -138,61 +206,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
PostQuitMessage(0);
break;
default:
return DefWindowProc(hwnd, msg, wParam, lParam);
return DefWindowProc(hwnd, message, wParam, lParam);
}
return 0;
}
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPSTR lpCmdLine, int nCmdShow)
{
WNDCLASSEX wc;
HWND hwnd;
MSG Msg;
wc.cbSize = sizeof(WNDCLASSEX);
wc.style = 0;
wc.lpfnWndProc = WndProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = hInstance;
wc.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_APPICON));
wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
wc.lpszMenuName = MAKEINTRESOURCE(IDR_APPMENU);
wc.lpszClassName = g_szClassName;
wc.hIconSm = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_APPICON), IMAGE_ICON, 16, 16, 0);
if(!RegisterClassEx(&wc))
{
MessageBox(NULL, "Window Registration Failed!", "Error!",
MB_ICONEXCLAMATION | MB_OK);
return 0;
}
hwnd = CreateWindowEx(
WS_EX_CLIENTEDGE,
g_szClassName,
"PC Name Grabber",
WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX,
CW_USEDEFAULT, CW_USEDEFAULT, 240, 120,
NULL, NULL, hInstance, NULL);
if(hwnd == NULL)
{
MessageBox(NULL, "Window Creation Failed!", "Error!",
MB_ICONEXCLAMATION | MB_OK);
return 0;
}
ShowWindow(hwnd, nCmdShow);
UpdateWindow(hwnd);
while(GetMessage(&Msg, NULL, 0, 0) > 0)
{
TranslateMessage(&Msg);
DispatchMessage(&Msg);
}
return Msg.wParam;
}
Successfully builds with wxDev-C++ build 7.4.0.77
\ No newline at end of file
Successfully builds with wxDev-C++ build 7.4.2.569
\ No newline at end of file
......@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Email: firedancer.development@gmail.com
* Website: http://firedancer-software.tk
* Email: admin@firedancer-software.com
* Website: http://firedancer-software.com
*
*/
......
......@@ -17,13 +17,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Email: firedancer.development@gmail.com
* Website: http://firedancer-software.tk
* Email: admin@firedancer-software.com
* Website: http://firedancer-software.com
*
*/
#include "resource.h"
#include "windows.h"
IDI_APPICON ICON "PCNameGrabber.ico"
......@@ -48,5 +49,5 @@ CAPTION "About PC Name Grabber"
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "&OK",IDOK,50,100,50,14
CTEXT "PC Name Grabber\r\nVersion 2.0.1\r\n\r\nCopyright \xa92012\r\n\r\nKen Herbert\r\n\r\nLicensed under the GNU General\r\nPublic License, version 3 (GPL-3.0)",IDC_STATIC,0,18,150,73
CTEXT "PC Name Grabber\r\nVersion 2.0.2\r\n\r\nCopyright \xa92012\r\n\r\nFiredancer Software\r\n\r\nLicensed under the GNU General\r\nPublic License, version 3 (GPL-3.0)",IDC_STATIC,0,18,150,73
END
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment